File tree Expand file tree Collapse file tree 7 files changed +12
-10
lines changed
Expand file tree Collapse file tree 7 files changed +12
-10
lines changed Original file line number Diff line number Diff line change 388388 "ImageName" : " mariner2-arm64" ,
389389 "IsLinux" : true ,
390390 "JobName" : " mariner2_arm64" ,
391- "OsVersion" : " Mariner 2.0 ARM 64v7 (In Validation)" ,
391+ "OsVersion" : " Mariner 2.0 ARM 64v8 (In Validation)" ,
392392 "TagList" : " preview-7.4-mariner-2.0-arm64;preview-mariner-2.0-arm64" ,
393393 "UseInCI" : false
394394 },
611611 "ImageName" : " mariner2-arm64" ,
612612 "IsLinux" : true ,
613613 "JobName" : " mariner2_arm64" ,
614- "OsVersion" : " Mariner 2.0 ARM 64v7 (In Validation)" ,
614+ "OsVersion" : " Mariner 2.0 ARM 64v8 (In Validation)" ,
615615 "TagList" : " 7.3-mariner-2.0-arm64;mariner-2.0-arm64" ,
616616 "UseInCI" : false
617617 },
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
5252 LANG=en_US.UTF-8 \
5353 # set a fixed location for the Module analysis cache
5454 PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
55- POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7 -Mariner-2
55+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8 -Mariner-2
5656
5757 # Copy only the files we need from the previous stage
5858 COPY --from=installer-env ["/opt/microsoft/powershell" , "/opt/microsoft/powershell" ]
Original file line number Diff line number Diff line change 22 "IsLinux" : true ,
33 "UseLinuxVersion" : false ,
44 "PackageFormat" : " powershell${channelTag}-${PS_VERSION}-linux-arm64.tar.gz" ,
5- "osVersion" : " Mariner 2.0 ARM 64v7 " ,
5+ "osVersion" : " Mariner 2.0 ARM 64v8 " ,
66 "SkipGssNtlmSspTests" : true ,
77 "ShortDistroName" : " mariner" ,
88 "shortTags" : [
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ FROM setup-tdnf-repa AS powershell
4444 LANG=en_US.UTF-8 \
4545 # set a fixed location for the Module analysis cache
4646 PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
47- POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
47+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8- Mariner-2.0
4848
4949 RUN --mount=type=cache,target=/var/cache/tdnf \
5050 # install dependencies
Original file line number Diff line number Diff line change 22 "IsLinux" : true ,
33 "UseLinuxVersion" : false ,
44 "PackageFormat" : " powershell-${PS_VERSION}-1.cm.aarch64.rpm" ,
5- "osVersion" : " Mariner 2.0 ARM 64v7 " ,
5+ "osVersion" : " Mariner 2.0 ARM 64v8 " ,
66 "SkipGssNtlmSspTests" : true ,
77 "ShortDistroName" : " mariner" ,
88 "shortTags" : [
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
5151 LANG=en_US.UTF-8 \
5252 # set a fixed location for the Module analysis cache
5353 PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
54- POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7 -Mariner-2
54+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8 -Mariner-2
5555
5656 RUN --mount=type=cache,target=/var/cache/tdnf \
5757 # install dependencies
Original file line number Diff line number Diff line change 11{
2- "IsLinux" : true ,
2+ "IsLinux" : true ,
33 "UseLinuxVersion" : false ,
44 "PackageFormat" : " powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm" ,
5- "osVersion" : " Mariner 2.0 ARM 64v7 " ,
5+ "osVersion" : " Mariner 2.0 ARM 64v8 " ,
66 "SkipGssNtlmSspTests" : true ,
77 "ShortDistroName" : " mariner" ,
88 "shortTags" : [
9- {"Tag" : " 2.0-arm64" }
9+ {
10+ "Tag" : " 2.0-arm64"
11+ }
1012 ],
1113 "TestProperties" : {
1214 "size" : 404 ,
You can’t perform that action at this time.
0 commit comments