From 760f25f2819e054392736e7070e4a41642ab0a5a Mon Sep 17 00:00:00 2001 From: Chongyi Zheng Date: Sun, 3 Mar 2024 23:01:18 -0500 Subject: [PATCH] Set correct arm64v8 info for mariner2 --- assets/matrix.json | 4 ++-- release/7-3/mariner2-arm64/docker/Dockerfile | 2 +- release/7-3/mariner2-arm64/meta.json | 2 +- release/7-4/mariner2-arm64/docker/Dockerfile | 2 +- release/7-4/mariner2-arm64/meta.json | 2 +- release/7-5/mariner2-arm64/docker/Dockerfile | 2 +- release/7-5/mariner2-arm64/meta.json | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/matrix.json b/assets/matrix.json index 915f6e924..5e2f5421e 100644 --- a/assets/matrix.json +++ b/assets/matrix.json @@ -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 }, diff --git a/release/7-3/mariner2-arm64/docker/Dockerfile b/release/7-3/mariner2-arm64/docker/Dockerfile index 86bb1d823..3d9a750b0 100644 --- a/release/7-3/mariner2-arm64/docker/Dockerfile +++ b/release/7-3/mariner2-arm64/docker/Dockerfile @@ -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"] diff --git a/release/7-3/mariner2-arm64/meta.json b/release/7-3/mariner2-arm64/meta.json index 968a7529c..6ac4e892e 100644 --- a/release/7-3/mariner2-arm64/meta.json +++ b/release/7-3/mariner2-arm64/meta.json @@ -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": [ diff --git a/release/7-4/mariner2-arm64/docker/Dockerfile b/release/7-4/mariner2-arm64/docker/Dockerfile index 4add4590e..555cde9a4 100644 --- a/release/7-4/mariner2-arm64/docker/Dockerfile +++ b/release/7-4/mariner2-arm64/docker/Dockerfile @@ -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 diff --git a/release/7-4/mariner2-arm64/meta.json b/release/7-4/mariner2-arm64/meta.json index 5d6cb3ccb..5ec268de2 100644 --- a/release/7-4/mariner2-arm64/meta.json +++ b/release/7-4/mariner2-arm64/meta.json @@ -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": [ diff --git a/release/7-5/mariner2-arm64/docker/Dockerfile b/release/7-5/mariner2-arm64/docker/Dockerfile index 23e28acd1..507983dbd 100644 --- a/release/7-5/mariner2-arm64/docker/Dockerfile +++ b/release/7-5/mariner2-arm64/docker/Dockerfile @@ -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"] diff --git a/release/7-5/mariner2-arm64/meta.json b/release/7-5/mariner2-arm64/meta.json index 7c0fd8cfc..80aba2562 100644 --- a/release/7-5/mariner2-arm64/meta.json +++ b/release/7-5/mariner2-arm64/meta.json @@ -2,7 +2,7 @@ "IsLinux" : true, "UseLinuxVersion": false, "PackageFormat": "powershell-${PS_VERSION}-linux-arm64.tar.gz", - "osVersion": "Mariner 2.0 ARM 64v7", + "osVersion": "Mariner 2.0 ARM 64v8", "SkipGssNtlmSspTests": true, "ShortDistroName": "mariner", "shortTags": [