Skip to content

Commit 124c0ab

Browse files
authored
Stop Mariner 2.0 build/verification (#127)
* Stop building/verifying Mariner-cm2 * Rename mariner to mariner-cm2
1 parent 246da1a commit 124c0ab

File tree

7 files changed

+5
-10
lines changed

7 files changed

+5
-10
lines changed

.devops/build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ extends:
156156
REGISTRIES=msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-$(distro)
157157
if [[ "$(distro)" == "azurelinux" ]]; then
158158
REGISTRIES+=";msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner"
159-
elif [[ "$(distro)" == "mariner" ]]; then
160-
REGISTRIES="msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner-cm2"
161159
fi
162160
echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
163161
displayName: Set REGISTRIES variable
@@ -233,9 +231,6 @@ extends:
233231
TAGS="$(version)-$(distro)"
234232
if [[ "$(distro)" == "azurelinux" ]]; then
235233
REGISTRIES+=";msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner"
236-
elif [[ "$(distro)" == "mariner" ]]; then
237-
REGISTRIES="msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner-cm2"
238-
TAGS="$(version)-mariner-cm2"
239234
fi
240235
echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
241236
echo "##vso[task.setvariable variable=TAGS]$TAGS"

.github/workflows/check-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
distros: [ "azurelinux", "mariner", "distroless" ]
15+
distros: [ "azurelinux", "distroless" ]
1616
jdkvendor: [ "temurin" ]
1717
jdkversion: [ { major: "8", expected: "1.8.0_462" } ]
1818
steps:
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
distros: [ "azurelinux", "mariner", "distroless", "ubuntu" ]
41+
distros: [ "azurelinux", "distroless", "ubuntu" ]
4242
jdkvendor: [ "msopenjdk" ]
4343
jdkversion: [ { major: "11", expected: "11.0.28" }, { major: "17", expected: "17.0.16" }, { major: "21", expected: "21.0.8" } ]
4444
steps:

.github/workflows/validate-published-images.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
distros: ["azurelinux", "mariner", "distroless"]
15+
distros: ["azurelinux", "distroless"]
1616
jdkvendor: ["temurin"]
1717
jdkversion: [{ major: "8", expected: "1.8.0_462" }]
1818
steps:
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
34+
distros: ["azurelinux", "distroless", "ubuntu"]
3535
jdkvendor: ["msopenjdk"]
3636
jdkversion:
3737
[
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
58+
distros: ["azurelinux", "distroless", "ubuntu"]
5959
jdkvendor: ["msopenjdk"]
6060
jdkversion:
6161
[
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)