Update Oct 2023 PSU versions (microsoft#81)

* Update Oct 2023 PSU versions * Set Mariner image tag to 2.0
Luigi96 · Oct 25, 2023 · dd78a8d · dd78a8d
1 parent c54b1a1
commit dd78a8d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.devops/build.yml b/.devops/build.yml
@@ -24,7 +24,7 @@ parameters:
         version: 8
         package: temurin-8
         image: "image-repository"
-        tag: "image-tag"
+        tag: "2.0"
       distroless_8:
         distro: distroless
         version: 8
@@ -39,12 +39,12 @@ parameters:
         package: msopenjdk-11
         image: "image-repository"
         tag: "image-tag"
-      mariner_cm1_11:
-        distro: mariner-cm1
+      mariner_11:
+        distro: mariner
         version: 11
         package: msopenjdk-11
         image: "image-repository"
-        tag: "1.0"
+        tag: "2.0"
       distroless_11:
         distro: distroless
         version: 11
@@ -59,12 +59,12 @@ parameters:
         package: msopenjdk-17
         image: "image-repository"
         tag: "image-tag"
-      mariner_cm1_17:
-        distro: mariner-cm1
+      mariner_17:
+        distro: mariner
         version: 17
         package: msopenjdk-17
         image: "image-repository"
-        tag: "1.0"
+        tag: "2.0"
       distroless_17:
         distro: distroless
         version: 17

diff --git a/.github/workflows/check-versions.yml b/.github/workflows/check-versions.yml
@@ -28,9 +28,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distros: [ "mariner", "distroless", "mariner-cm1", "ubuntu" ]
+        distros: [ "mariner", "distroless", "ubuntu" ]
         jdkvendor: [ "msopenjdk" ]
-        jdkversion: [ { major: "11", expected: "11.0.20.1" }, { major: "17", expected: "17.0.8.1" }, { major: "21", expected: "21" } ]
+        jdkversion: [ { major: "11", expected: "11.0.21" }, { major: "17", expected: "17.0.9" }, { major: "21", expected: "21.0.1" } ]
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/validate-published-images.yml b/.github/workflows/validate-published-images.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         distros: [ "mariner", "distroless", "ubuntu" ]
         jdkvendor: [ "msopenjdk" ]
-        jdkversion: [ { major: "11", expected: "11.0.20.1" }, { major: "17", expected: "17.0.8.1" }, { major: "21", expected: "21" } ]
+        jdkversion: [ { major: "11", expected: "11.0.21" }, { major: "17", expected: "17.0.9" }, { major: "21", expected: "21.0.1" } ]
     steps:
       - uses: actions/checkout@v4
 
@@ -42,7 +42,7 @@ jobs:
       matrix:
         distros: [ "mariner", "distroless", "ubuntu" ]
         jdkvendor: [ "msopenjdk" ]
-        jdkversion: [ { major: "11", expected: "11.0.20.1" }, { major: "17", expected: "17.0.8.1" }, { major: "21", expected: "21" } ]
+        jdkversion: [ { major: "11", expected: "11.0.21" }, { major: "17", expected: "17.0.9" }, { major: "21", expected: "21.0.1" } ]
     steps:
       - uses: actions/checkout@v4