From 5c15afdbe8c978b2fa8819fc9bd288fb9c78c078 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 10:59:51 -0700 Subject: [PATCH 1/7] Create mirrorInternalImages.yml --- .vsts-ci/mirrorInternalImages.yml | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .vsts-ci/mirrorInternalImages.yml diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml new file mode 100644 index 000000000..0d7296fd1 --- /dev/null +++ b/.vsts-ci/mirrorInternalImages.yml @@ -0,0 +1,32 @@ +variables: + - group: mcrint + +jobs: +- job: Mirror + pool: + vmImage: vs2017-win2016 + + strategy: + matrix: + servercore: + sourceImage: private/windows/servercore:ltsc2022 + targetImage: windows/servercore:ltsc2022 + nanoserver: + sourceImage: private/windows/nanoserver:ltsc2022 + targetImage: windows/nanoserver:ltsc2022 + + displayName: Mirror Image $(targetImage) + steps: + - checkout: self + - task: AzureCLI@2 + displayName: Mirror $(targetImage) + inputs: + connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9 + scriptType: pscore + scriptLocation: inlineScript + inlineScript: >- + az acr import --name $(targetusername) ` + --source $(mcrinthostname)/$(sourceImage) ` + --image $(targetImage) ` + --username $(mcrintusername) ` + --password $(mcrintsecret) From 099ec983256a1946540599c77f5992876824e5fb Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 11:48:22 -0700 Subject: [PATCH 2/7] Update mirrorInternalImages.yml --- .vsts-ci/mirrorInternalImages.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml index 0d7296fd1..72fcbe6bb 100644 --- a/.vsts-ci/mirrorInternalImages.yml +++ b/.vsts-ci/mirrorInternalImages.yml @@ -1,5 +1,10 @@ variables: - group: mcrint + +parameters: + - name: publicSource + value: no + displayname: no if the source requires login, yes if the source does not. jobs: - job: Mirror @@ -19,7 +24,8 @@ jobs: steps: - checkout: self - task: AzureCLI@2 - displayName: Mirror $(targetImage) + displayName: Mirror $(targetImage) - with login + condition: and(succeeded(), eq('${{ parameters.publicSource', 'no')) inputs: connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9 scriptType: pscore @@ -30,3 +36,15 @@ jobs: --image $(targetImage) ` --username $(mcrintusername) ` --password $(mcrintsecret) + - task: AzureCLI@2 + displayName: Mirror $(targetImage) - without login + condition: and(succeeded(), ne('${{ parameters.publicSource', 'no')) + inputs: + connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9 + scriptType: pscore + scriptLocation: inlineScript + inlineScript: >- + az acr import --name $(targetusername) ` + --source $(mcrinthostname)/$(sourceImage) ` + --image $(targetImage) + From a781be259b1d419baf8baac49471fb61b63aaa5e Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 18:53:26 +0000 Subject: [PATCH 3/7] fix names --- .vsts-ci/mirrorInternalImages.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml index 72fcbe6bb..35c9040f0 100644 --- a/.vsts-ci/mirrorInternalImages.yml +++ b/.vsts-ci/mirrorInternalImages.yml @@ -1,10 +1,10 @@ variables: - group: mcrint - + parameters: - name: publicSource - value: no - displayname: no if the source requires login, yes if the source does not. + default: no + displayName: no if the source requires login, yes if the source does not. jobs: - job: Mirror @@ -13,10 +13,10 @@ jobs: strategy: matrix: - servercore: + servercore: sourceImage: private/windows/servercore:ltsc2022 targetImage: windows/servercore:ltsc2022 - nanoserver: + nanoserver: sourceImage: private/windows/nanoserver:ltsc2022 targetImage: windows/nanoserver:ltsc2022 @@ -47,4 +47,4 @@ jobs: az acr import --name $(targetusername) ` --source $(mcrinthostname)/$(sourceImage) ` --image $(targetImage) - + From 4474d18c623ab06856cbbe3c4b64825b085f7674 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 18:54:37 +0000 Subject: [PATCH 4/7] fix parameter ref --- .vsts-ci/mirrorInternalImages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml index 35c9040f0..f291fe920 100644 --- a/.vsts-ci/mirrorInternalImages.yml +++ b/.vsts-ci/mirrorInternalImages.yml @@ -25,7 +25,7 @@ jobs: - checkout: self - task: AzureCLI@2 displayName: Mirror $(targetImage) - with login - condition: and(succeeded(), eq('${{ parameters.publicSource', 'no')) + condition: and(succeeded(), eq('${{ parameters.publicSource }}', 'no')) inputs: connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9 scriptType: pscore @@ -38,7 +38,7 @@ jobs: --password $(mcrintsecret) - task: AzureCLI@2 displayName: Mirror $(targetImage) - without login - condition: and(succeeded(), ne('${{ parameters.publicSource', 'no')) + condition: and(succeeded(), ne('${{ parameters.publicSource }}', 'no')) inputs: connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9 scriptType: pscore From 3192e4b819a4cd864bb7c404966f12e9ab3ed3f5 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 19:02:37 +0000 Subject: [PATCH 5/7] add source params --- .vsts-ci/mirrorInternalImages.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml index f291fe920..f36027791 100644 --- a/.vsts-ci/mirrorInternalImages.yml +++ b/.vsts-ci/mirrorInternalImages.yml @@ -5,6 +5,15 @@ parameters: - name: publicSource default: no displayName: no if the source requires login, yes if the source does not. + - name: sourceHostName + default: $(mcrinthostname) + displayName: Source HostName + - name: sourceServerCoreImageName + default: windows/servercore:ltsc2022 + displayName: Source Window servercore Image name without server name + - name: sourceNanoImageName + default: windows/nanoserver:ltsc2022 + displayName: Source Window servercore Image name without server name jobs: - job: Mirror @@ -14,10 +23,10 @@ jobs: strategy: matrix: servercore: - sourceImage: private/windows/servercore:ltsc2022 + sourceImage: ${{ parameters.sourceServerCoreImageName }} targetImage: windows/servercore:ltsc2022 nanoserver: - sourceImage: private/windows/nanoserver:ltsc2022 + sourceImage: ${{ parameters.sourceNanoImageName }} targetImage: windows/nanoserver:ltsc2022 displayName: Mirror Image $(targetImage) From 5a90e2b561474da810edff228094883de8699e30 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 19:11:06 +0000 Subject: [PATCH 6/7] force overwritting exisitng tags --- .vsts-ci/mirrorInternalImages.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml index f36027791..287243256 100644 --- a/.vsts-ci/mirrorInternalImages.yml +++ b/.vsts-ci/mirrorInternalImages.yml @@ -29,7 +29,7 @@ jobs: sourceImage: ${{ parameters.sourceNanoImageName }} targetImage: windows/nanoserver:ltsc2022 - displayName: Mirror Image $(targetImage) + displayName: Mirror Image steps: - checkout: self - task: AzureCLI@2 @@ -44,7 +44,7 @@ jobs: --source $(mcrinthostname)/$(sourceImage) ` --image $(targetImage) ` --username $(mcrintusername) ` - --password $(mcrintsecret) + --password $(mcrintsecret) --force - task: AzureCLI@2 displayName: Mirror $(targetImage) - without login condition: and(succeeded(), ne('${{ parameters.publicSource }}', 'no')) @@ -55,5 +55,5 @@ jobs: inlineScript: >- az acr import --name $(targetusername) ` --source $(mcrinthostname)/$(sourceImage) ` - --image $(targetImage) + --image $(targetImage) --force From cd5f957c1d14b95810a0c857cfb98eb4c3ace54d Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 12 Aug 2021 12:44:16 -0700 Subject: [PATCH 7/7] Update .vsts-ci/mirrorInternalImages.yml --- .vsts-ci/mirrorInternalImages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml index 287243256..449cbca96 100644 --- a/.vsts-ci/mirrorInternalImages.yml +++ b/.vsts-ci/mirrorInternalImages.yml @@ -6,7 +6,6 @@ parameters: default: no displayName: no if the source requires login, yes if the source does not. - name: sourceHostName - default: $(mcrinthostname) displayName: Source HostName - name: sourceServerCoreImageName default: windows/servercore:ltsc2022