Merge branch 'master' into updatecli_58dc4aa87938c6ff9daa5d4fa6b764c9…

…5540c8f06a90d685071757162ada535a
jenkinsci · Oct 22, 2023 · c456263 · c456263
2 parents 7d08d41 + 544eda3
commit c456263
Showing 1 changed file with 87 additions and 10 deletions.
diff --git a/updatecli/updatecli.d/bullseye.yaml → updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/bullseye.yaml → updatecli/updatecli.d/debian.yaml
@@ -21,7 +21,7 @@ sources:
       - trimprefix: "bookworm-"
     spec:
       image: "debian"
-      tagFilter: "bookworm-*"
+      tagfilter: "bookworm-*"
       versionfilter:
         kind: regex
         pattern: >-
@@ -33,7 +33,7 @@ sources:
       - trimprefix: "bookworm-"
     spec:
       image: "debian"
-      tagFilter: "bookworm-*"
+      tagfilter: "bookworm-*"
       versionfilter:
         kind: regex
         pattern: >-
@@ -49,21 +49,21 @@ conditions:
       instruction:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
-  testDockerfileArgJDK17:
+  testDockerfileArgJDK11Slim:
     name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?"
     kind: dockerfile
     disablesourceinput: true
     spec:
-      file: 17/debian/bookworm/hotspot/Dockerfile
+      file: 11/debian/bookworm-slim/hotspot/Dockerfile
       instruction:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
-  testDockerfileArgJDK11Slim:
+  testDockerfileArgJDK17:
     name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?"
     kind: dockerfile
     disablesourceinput: true
     spec:
-      file: 11/debian/bookworm-slim/hotspot/Dockerfile
+      file: 17/debian/bookworm/hotspot/Dockerfile
       instruction:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
@@ -76,6 +76,42 @@ conditions:
       instruction:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
+  testDockerfileArgJDK21:
+    name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?"
+    kind: dockerfile
+    disablesourceinput: true
+    spec:
+      file: 21/debian/bookworm/hotspot/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+  testDockerfileArgJDK21Slim:
+    name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?"
+    kind: dockerfile
+    disablesourceinput: true
+    spec:
+      file: 21/debian/bookworm-slim/hotspot/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+  testDockerfileArgJDK21Preview:
+    name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?"
+    kind: dockerfile
+    disablesourceinput: true
+    spec:
+      file: 21/debian/bookworm/hotspot/preview/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+  testDockerfileArgJDK21SlimPreview:
+    name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?"
+    kind: dockerfile
+    disablesourceinput: true
+    spec:
+      file: 21/debian/bookworm-slim/hotspot/preview/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
   testVersionInBakeFile:
     name: "Does the bake file have variable BOOKWORM_TAG"
     kind: file
@@ -95,22 +131,22 @@ targets:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
     scmid: default
-  updateDockerfileJDK17:
+  updateDockerfileJDK11Slim:
     name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile"
     kind: dockerfile
     sourceid: bookwormLatestVersion
     spec:
-      file: 17/debian/bookworm/hotspot/Dockerfile
+      file: 11/debian/bookworm-slim/hotspot/Dockerfile
       instruction:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
     scmid: default
-  updateDockerfileJDK11Slim:
+  updateDockerfileJDK17:
     name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile"
     kind: dockerfile
     sourceid: bookwormLatestVersion
     spec:
-      file: 11/debian/bookworm-slim/hotspot/Dockerfile
+      file: 17/debian/bookworm/hotspot/Dockerfile
       instruction:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
@@ -125,6 +161,46 @@ targets:
         keyword: "ARG"
         matcher: "BOOKWORM_TAG"
     scmid: default
+  updateDockerfileJDK21:
+    name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile"
+    kind: dockerfile
+    sourceid: bookwormLatestVersion
+    spec:
+      file: 21/debian/bookworm/hotspot/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+    scmid: default
+  updateDockerfileJDK21Slim:
+    name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile"
+    kind: dockerfile
+    sourceid: bookwormLatestVersion
+    spec:
+      file: 21/debian/bookworm-slim/hotspot/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+    scmid: default
+  updateDockerfileJDK21Preview:
+    name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile"
+    kind: dockerfile
+    sourceid: bookwormLatestVersion
+    spec:
+      file: 21/debian/bookworm/hotspot/preview/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+    scmid: default
+  updateDockerfileJDK21SlimPreview:
+    name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile"
+    kind: dockerfile
+    sourceid: bookwormLatestVersion
+    spec:
+      file: 21/debian/bookworm-slim/hotspot/preview/Dockerfile
+      instruction:
+        keyword: "ARG"
+        matcher: "BOOKWORM_TAG"
+    scmid: default
   updateDockerBake:
     name: "Update the value of the base image (ARG BOOKWORM_TAG) in the docker-bake.hcl"
     kind: file
@@ -144,3 +220,4 @@ actions:
     spec:
       labels:
         - dependencies
+        - debian