Skip to content

Commit

Permalink
Track Java versions for Windows with updatecli (jenkinsci#1781)
Browse files Browse the repository at this point in the history
* chore(updatecli): adapt jdk11 and jdk17 manifests for Windows

* Fix spelling error in checkTemurinWindowsRelease

* Update Java 21 version in build-windows.yaml

---------

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
  • Loading branch information
lemeurherve and MarkEWaite committed Apr 24, 2024
1 parent e4fc71b commit 0d9f797
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
7 changes: 7 additions & 0 deletions updatecli/updatecli.d/jdk11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ targets:
keyword: ARG
matcher: JAVA_VERSION
scmid: default
setJDK11VersionWindowsDockerCompose:
name: "Bump JDK11 version in build-windows.yaml"
kind: yaml
spec:
file: build-windows.yaml
key: $.services.jdk11.build.args.JAVA_VERSION
scmid: default

actions:
default:
Expand Down
18 changes: 17 additions & 1 deletion updatecli/updatecli.d/jdk17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ conditions:
spec:
command: sh ./jdk-download-url.sh '{{source "lastVersion" }}' standard "x64 aarch64 s390x"
disablesourceinput: true
checkTemurinWWindowsRelease:
checkTemurinWindowsRelease:
name: Check if the "<lastVersion>" is available for Windows
kind: shell
spec:
Expand Down Expand Up @@ -97,6 +97,22 @@ targets:
keyword: ARG
matcher: JAVA_VERSION
scmid: default
setJDK17VersionWindowsDockerImage:
name: "Bump default JDK17 version for Linux images in the Windows Dockerfile"
kind: dockerfile
spec:
file: windows/windowsservercore/hotspot/Dockerfile
instruction:
keyword: ARG
matcher: JAVA_VERSION
scmid: default
setJDK17VersionWindowsDockerCompose:
name: "Bump JDK17 version in build-windows.yaml"
kind: yaml
spec:
file: build-windows.yaml
key: $.services.jdk17.build.args.JAVA_VERSION
scmid: default

actions:
default:
Expand Down
7 changes: 7 additions & 0 deletions updatecli/updatecli.d/jdk21.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ targets:
keyword: ARG
matcher: JAVA_VERSION
scmid: default
setJDK21VersionWindowsDockerCompose:
name: "Bump JDK21 version in build-windows.yaml"
kind: yaml
spec:
file: build-windows.yaml
key: $.services.jdk21.build.args.JAVA_VERSION
scmid: default

actions:
default:
Expand Down

0 comments on commit 0d9f797

Please sign in to comment.