Skip to content

Stop Mariner 2.0 build/verification #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luigi96 merged 2 commits into from
Aug 6, 2025
Merged

Stop Mariner 2.0 build/verification #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53daaeb
Stop building/verifying Mariner-cm2
Luigi96 Aug 5, 2025
90f6ecc
Rename mariner to mariner-cm2
Luigi96 Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .devops/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ extends:
REGISTRIES=msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-$(distro)
if [[ "$(distro)" == "azurelinux" ]]; then
REGISTRIES+=";msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner"
Copy link
Member

@karianna karianna Aug 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know there's aliasing involved here but just checking that this line is also correct (azurelinux label, referencing mariner registry).

Copy link
Contributor Author

@Luigi96 Luigi96 Aug 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, mariner images should point to azurelinux according to our post

elif [[ "$(distro)" == "mariner" ]]; then
REGISTRIES="msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner-cm2"
fi
echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
displayName: Set REGISTRIES variable
Expand Down Expand Up @@ -233,9 +231,6 @@ extends:
TAGS="$(version)-$(distro)"
if [[ "$(distro)" == "azurelinux" ]]; then
REGISTRIES+=";msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner"
elif [[ "$(distro)" == "mariner" ]]; then
REGISTRIES="msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner-cm2"
TAGS="$(version)-mariner-cm2"
fi
echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
echo "##vso[task.setvariable variable=TAGS]$TAGS"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distros: [ "azurelinux", "mariner", "distroless" ]
distros: [ "azurelinux", "distroless" ]
jdkvendor: [ "temurin" ]
jdkversion: [ { major: "8", expected: "1.8.0_452" } ]
steps:
Expand All @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distros: [ "azurelinux", "mariner", "distroless", "ubuntu" ]
distros: [ "azurelinux", "distroless", "ubuntu" ]
jdkvendor: [ "msopenjdk" ]
jdkversion: [ { major: "11", expected: "11.0.27" }, { major: "17", expected: "17.0.15" }, { major: "21", expected: "21.0.7" } ]
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate-published-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distros: ["azurelinux", "mariner", "distroless"]
distros: ["azurelinux", "distroless"]
jdkvendor: ["temurin"]
jdkversion: [{ major: "8", expected: "1.8.0_452" }]
steps:
Expand All @@ -31,7 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
distros: ["azurelinux", "distroless", "ubuntu"]
jdkvendor: ["msopenjdk"]
jdkversion:
[
Expand All @@ -55,7 +55,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
distros: ["azurelinux", "distroless", "ubuntu"]
jdkvendor: ["msopenjdk"]
jdkversion:
[
Expand Down
0 docker/mariner/Dockerfile.msopenjdk-11-jdk → ...r/mariner-cm2/Dockerfile.msopenjdk-11-jdk
View file
Open in desktop
File renamed without changes.
0 docker/mariner/Dockerfile.msopenjdk-17-jdk → ...r/mariner-cm2/Dockerfile.msopenjdk-17-jdk
View file
Open in desktop
File renamed without changes.
0 docker/mariner/Dockerfile.msopenjdk-21-jdk → ...r/mariner-cm2/Dockerfile.msopenjdk-21-jdk
View file
Open in desktop
File renamed without changes.
0 docker/mariner/Dockerfile.temurin-8-jdk → docker/mariner-cm2/Dockerfile.temurin-8-jdk
View file
Open in desktop
File renamed without changes.
Loading