File tree 7 files changed +12
-10
lines changed 7 files changed +12
-10
lines changed Original file line number Diff line number Diff line change 388
388
"ImageName" : " mariner2-arm64" ,
389
389
"IsLinux" : true ,
390
390
"JobName" : " mariner2_arm64" ,
391
- "OsVersion" : " Mariner 2.0 ARM 64v7 (In Validation)" ,
391
+ "OsVersion" : " Mariner 2.0 ARM 64v8 (In Validation)" ,
392
392
"TagList" : " preview-7.4-mariner-2.0-arm64;preview-mariner-2.0-arm64" ,
393
393
"UseInCI" : false
394
394
},
611
611
"ImageName" : " mariner2-arm64" ,
612
612
"IsLinux" : true ,
613
613
"JobName" : " mariner2_arm64" ,
614
- "OsVersion" : " Mariner 2.0 ARM 64v7 (In Validation)" ,
614
+ "OsVersion" : " Mariner 2.0 ARM 64v8 (In Validation)" ,
615
615
"TagList" : " 7.3-mariner-2.0-arm64;mariner-2.0-arm64" ,
616
616
"UseInCI" : false
617
617
},
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
52
52
LANG=en_US.UTF-8 \
53
53
# set a fixed location for the Module analysis cache
54
54
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
55
- POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7 -Mariner-2
55
+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8 -Mariner-2
56
56
57
57
# Copy only the files we need from the previous stage
58
58
COPY --from=installer-env ["/opt/microsoft/powershell" , "/opt/microsoft/powershell" ]
Original file line number Diff line number Diff line change 2
2
"IsLinux" : true ,
3
3
"UseLinuxVersion" : false ,
4
4
"PackageFormat" : " powershell${channelTag}-${PS_VERSION}-linux-arm64.tar.gz" ,
5
- "osVersion" : " Mariner 2.0 ARM 64v7 " ,
5
+ "osVersion" : " Mariner 2.0 ARM 64v8 " ,
6
6
"SkipGssNtlmSspTests" : true ,
7
7
"ShortDistroName" : " mariner" ,
8
8
"shortTags" : [
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ FROM setup-tdnf-repa AS powershell
44
44
LANG=en_US.UTF-8 \
45
45
# set a fixed location for the Module analysis cache
46
46
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
47
- POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
47
+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8- Mariner-2.0
48
48
49
49
RUN --mount=type=cache,target=/var/cache/tdnf \
50
50
# install dependencies
Original file line number Diff line number Diff line change 2
2
"IsLinux" : true ,
3
3
"UseLinuxVersion" : false ,
4
4
"PackageFormat" : " powershell-${PS_VERSION}-1.cm.aarch64.rpm" ,
5
- "osVersion" : " Mariner 2.0 ARM 64v7 " ,
5
+ "osVersion" : " Mariner 2.0 ARM 64v8 " ,
6
6
"SkipGssNtlmSspTests" : true ,
7
7
"ShortDistroName" : " mariner" ,
8
8
"shortTags" : [
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
51
51
LANG=en_US.UTF-8 \
52
52
# set a fixed location for the Module analysis cache
53
53
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
54
- POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7 -Mariner-2
54
+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8 -Mariner-2
55
55
56
56
RUN --mount=type=cache,target=/var/cache/tdnf \
57
57
# install dependencies
Original file line number Diff line number Diff line change 1
1
{
2
- "IsLinux" : true ,
2
+ "IsLinux" : true ,
3
3
"UseLinuxVersion" : false ,
4
4
"PackageFormat" : " powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm" ,
5
- "osVersion" : " Mariner 2.0 ARM 64v7 " ,
5
+ "osVersion" : " Mariner 2.0 ARM 64v8 " ,
6
6
"SkipGssNtlmSspTests" : true ,
7
7
"ShortDistroName" : " mariner" ,
8
8
"shortTags" : [
9
- {"Tag" : " 2.0-arm64" }
9
+ {
10
+ "Tag" : " 2.0-arm64"
11
+ }
10
12
],
11
13
"TestProperties" : {
12
14
"size" : 404 ,
You can’t perform that action at this time.
0 commit comments