Skip to content

Commit 5e1d255

Browse files
authoredJul 25, 2022
Make jenkins jdk tool match manifest jdk naming (#170)
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent a249627 commit 5e1d255

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
 

‎resources/baseJenkins.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -159,25 +159,25 @@ tool:
159159
name: "Default"
160160
jdk:
161161
installations:
162-
- name: "jdk-8"
162+
- name: "openjdk-8"
163163
properties:
164164
- installSource:
165165
installers:
166166
- adoptOpenJdkInstaller:
167167
id: "jdk8u332-b09"
168-
- name: "jdk-11"
168+
- name: "openjdk-11"
169169
properties:
170170
- installSource:
171171
installers:
172172
- adoptOpenJdkInstaller:
173173
id: "jdk-11.0.15+10"
174-
- name: "jdk-14"
174+
- name: "openjdk-14"
175175
properties:
176176
- installSource:
177177
installers:
178178
- adoptOpenJdkInstaller:
179179
id: "jdk-14.0.2+12"
180-
- name: "jdk-17"
180+
- name: "openjdk-17"
181181
properties:
182182
- installSource:
183183
installers:

‎test/data/test_env.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -171,25 +171,25 @@ tool:
171171
name: Default
172172
jdk:
173173
installations:
174-
- name: jdk-8
174+
- name: openjdk-8
175175
properties:
176176
- installSource:
177177
installers:
178178
- adoptOpenJdkInstaller:
179179
id: jdk8u332-b09
180-
- name: jdk-11
180+
- name: openjdk-11
181181
properties:
182182
- installSource:
183183
installers:
184184
- adoptOpenJdkInstaller:
185185
id: jdk-11.0.15+10
186-
- name: jdk-14
186+
- name: openjdk-14
187187
properties:
188188
- installSource:
189189
installers:
190190
- adoptOpenJdkInstaller:
191191
id: jdk-14.0.2+12
192-
- name: jdk-17
192+
- name: openjdk-17
193193
properties:
194194
- installSource:
195195
installers:

0 commit comments

Comments
 (0)