feat(JDK21) Use official Temurin build for linux/s390x

jenkinsci · Mar 21, 2024 · 7becf2f · 7becf2f
1 parent 2d69ed2
commit 7becf2f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -27,7 +27,7 @@ group "linux-arm32" {
 group "linux-s390x" {
   targets = [
     "debian_jdk11",
-    "debian_jdk21-preview"
+    "debian_jdk21"
   ]
 }
 
@@ -196,7 +196,7 @@ target "debian_jdk21" {
     "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk21",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21",
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
 }
 
 target "debian_jdk21-preview" {
@@ -215,5 +215,5 @@ target "debian_jdk21-preview" {
     "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk21-preview",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview",
   ]
-  platforms = ["linux/s390x", "linux/arm/v7"]
+  platforms = ["linux/arm/v7"]
 }
diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml
@@ -39,7 +39,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk11LastVersion>-jdk-alpine" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: linux/amd64
       image: eclipse-temurin
       tag: '{{source "jdk11LastVersion" }}-jdk-alpine'
   checkTemurinJDK11DebianDockerImages:
@@ -48,18 +48,18 @@ conditions:
     disablesourceinput: true
     spec:
       architectures:
-        - amd64
-        - arm64
-        - s390x
-        - arm/v7
+        - linux/amd64
+        - linux/arm64
+        - linux/s390x
+        - linux/arm/v7
       image: eclipse-temurin
       tag: '{{source "jdk11LastVersion" }}-jdk-jammy'
   checkTemurinJDK11WindowsCoreDockerImage:
     kind: dockerimage
     name: Check if the container image "eclipse-temurin:<jdk11LastVersion>-jdk-windowsservercore-1809" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: windows/amd64
       image: eclipse-temurin
       tag: '{{source "jdk11LastVersion" }}-jdk-windowsservercore-1809'
 

diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml
@@ -39,7 +39,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk17LastVersion>-jdk-alpine" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: linux/amd64
       image: eclipse-temurin
       tag: '{{source "jdk17LastVersion" }}-jdk-alpine'
   checkTemurinJDK17DebianDockerImages:
@@ -48,18 +48,18 @@ conditions:
     disablesourceinput: true
     spec:
       architectures:
-        - amd64
-        - arm64
-        - s390x
-        - arm/v7
+        - linux/amd64
+        - linux/arm64
+        - linux/s390x
+        - linux/arm/v7
       image: eclipse-temurin
       tag: '{{source "jdk17LastVersion" }}-jdk-jammy'
   checkTemurinJDK17WindowsCoreDockerImage:
     kind: dockerimage
     name: Check if the container image "eclipse-temurin:<jdk17LastVersion>-jdk-windowsservercore-1809" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: windows/amd64
       image: eclipse-temurin
       tag: '{{source "jdk17LastVersion" }}-jdk-windowsservercore-1809'
 

diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml
@@ -39,7 +39,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk21LastVersion>-jdk-alpine" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: linux/amd64
       image: eclipse-temurin
       tag: '{{source "jdk21LastVersion" }}-jdk-alpine'
   checkTemurinJDK21DebianDockerImages:
@@ -48,18 +48,17 @@ conditions:
     disablesourceinput: true
     spec:
       architectures:
-        - amd64
-        - arm64
-        - s390x
-        - arm/v7
+        - linux/amd64
+        - linux/arm64
+        - linux/s390x
       image: eclipse-temurin
       tag: '{{source "jdk21LastVersion" }}-jdk-jammy'
   checkTemurinJDK21WindowsCoreDockerImage:
     kind: dockerimage
     name: Check if the container image "eclipse-temurin:<jdk21LastVersion>-jdk-windowsservercore-1809" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: windows/amd64
       image: eclipse-temurin
       tag: '{{source "jdk21LastVersion" }}-jdk-windowsservercore-1809'