Skip to content

Set correct arm64v8 info for mariner2 #798

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −17
Open

Set correct arm64v8 info for mariner2 #798

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8d46b9
Set correct arm64v8 info for mariner2
harryzcy Mar 4, 2024
94ea78c
Set arch also to Azure Linux 3
harryzcy May 23, 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
4 changes: 2 additions & 2 deletions assets/matrix.json
View file
Original file line number Diff line number Diff line change
@@ -388,7 +388,7 @@
"ImageName": "mariner2-arm64",
"IsLinux": true,
"JobName": "mariner2_arm64",
"OsVersion": "Mariner 2.0 ARM 64v7 (In Validation)",
"OsVersion": "Mariner 2.0 ARM 64v8 (In Validation)",
"TagList": "preview-7.4-mariner-2.0-arm64;preview-mariner-2.0-arm64",
"UseInCI": false
},
@@ -611,7 +611,7 @@
"ImageName": "mariner2-arm64",
"IsLinux": true,
"JobName": "mariner2_arm64",
"OsVersion": "Mariner 2.0 ARM 64v7 (In Validation)",
"OsVersion": "Mariner 2.0 ARM 64v8 (In Validation)",
"TagList": "7.3-mariner-2.0-arm64;mariner-2.0-arm64",
"UseInCI": false
},
2 changes: 1 addition & 1 deletion release/7-3/mariner2-arm64/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2

# Copy only the files we need from the previous stage
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
2 changes: 1 addition & 1 deletion release/7-3/mariner2-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-linux-arm64.tar.gz",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [
2 changes: 1 addition & 1 deletion release/7-4/azurelinux3-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Azure Linux 3.0 ARM 64v7",
"osVersion": "Azure Linux 3.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "azurelinux",
"shortTags": [
2 changes: 1 addition & 1 deletion release/7-4/mariner2-arm64/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2.0

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
2 changes: 1 addition & 1 deletion release/7-4/mariner2-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [
2 changes: 1 addition & 1 deletion release/7-5/azurelinux3-arm64/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-AzureLinux-3
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-AzureLinux-3

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
2 changes: 1 addition & 1 deletion release/7-5/azurelinux3-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Azure Linux 3.0 ARM 64v7",
"osVersion": "Azure Linux 3.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "azurelinux",
"shortTags": [
2 changes: 1 addition & 1 deletion release/7-5/mariner2-arm64/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
8 changes: 5 additions & 3 deletions release/7-5/mariner2-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"IsLinux" : true,
"IsLinux": true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [
{"Tag": "2.0-arm64"}
{
"Tag": "2.0-arm64"
}
],
"TestProperties": {
"size": 404,
2 changes: 1 addition & 1 deletion release/7-6/azurelinux3-arm64/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-AzureLinux-3
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-AzureLinux-3

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
2 changes: 1 addition & 1 deletion release/7-6/azurelinux3-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Azure Linux 3.0 ARM 64v7",
"osVersion": "Azure Linux 3.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "azurelinux",
"shortTags": [
2 changes: 1 addition & 1 deletion release/7-6/mariner2-arm64/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
2 changes: 1 addition & 1 deletion release/7-6/mariner2-arm64/meta.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [