Skip to content

Migrate powershell docker scripts to docker@2 #1666

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

Merged
merged 8 commits into from
Nov 17, 2022
Merged

Migrate powershell docker scripts to docker@2 #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b01e337
feat: migrate powershell docker scripts to docker@2
estebancams Oct 19, 2022
4f139be
feat: added retry to docker task
Oct 31, 2022
5764722
fix: added repo info for image push step
Nov 1, 2022
ffe3836
fix: added missing parameters for windows template parents
Nov 1, 2022
d03506c
fix: removed debugging lines
Nov 3, 2022
7d7d425
Merge branch 'master' into estebanca/update-windows-template-native-d…
estebancams Nov 10, 2022
cd4e4c1
Merge branch 'master' into estebanca/update-windows-template-native-d…
estebancams Nov 11, 2022
718c632
Merge branch 'master' into estebanca/update-windows-template-native-d…
estebancams Nov 17, 2022
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
32 changes: 23 additions & 9 deletions .pipelines/containers/container-template-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ parameters:
name: ""
arch: ""
tag: ""
ai_path: ""
ai_path_var: ""
ai_id: ""
ai_id_var: ""

steps:
- task: Docker@2
Expand All @@ -11,19 +15,29 @@ steps:
command: 'login'
addPipelineData: false

- powershell: |
echo "using tag ${{ parameters.tag }}"
. .\build\scripts\windows.ps1; ${{ parameters.name }}-image windows-${{ parameters.arch }}-${{ parameters.tag }}
name: image_build
- task: Docker@2
displayName: Image Build
retryCountOnTaskFailure: 3
retryCountOnTaskFailure: 3
inputs:
command: 'build'
containerRegistry: $(ACR_SERVICE_CONNECTION)
repository: 'azure-${{ parameters.name }}'
tags: 'windows-${{ parameters.arch }}-${{ parameters.tag }}'
Dockerfile: '${{ parameters.name }}/windows.Dockerfile'
arguments: '
--build-arg VERSION=windows-${{ parameters.arch }}-${{ parameters.tag }}
Copy link
Contributor

@camrynl camrynl Nov 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like --build-arg is causing some errors in npm conformance test windows image builds

https://msazure.visualstudio.com/One/_build/results?buildId=63255597&view=logs&j=d229707a-47a3-50aa-1e61-a9a0b4c37ede&t=332ad56f-85e0-5dad-680f-4202a0f5b9d7&l=102

Copy link
Contributor Author

@estebancams estebancams Nov 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed this issue

--build-arg ${{ parameters.ai_path_var }}=${{ parameters.ai_path }}
--build-arg ${{ parameters.ai_id_var }}=${{ parameters.ai_id }}'
buildContext: '**/..'

- powershell: |
$registry = "acnpublic.azurecr.io"
docker push $registry/azure-${{ parameters.name }}:windows-${{ parameters.arch }}-${{ parameters.tag }}
name: image_push
- task: Docker@2
displayName: Image Push
retryCountOnTaskFailure: 3
inputs:
command: 'push'
containerRegistry: $(ACR_SERVICE_CONNECTION)
repository: 'azure-${{ parameters.name }}'
tags: 'windows-${{ parameters.arch }}-${{ parameters.tag }}'

- task: Docker@2
displayName: Logout
Expand Down
8 changes: 8 additions & 0 deletions .pipelines/npm/npm-conformance-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,20 @@ jobs:
npm_windows_amd64:
arch: amd64
name: npm
ai_path: github.com/Azure/azure-container-networking/npm.aiMetadata
ai_path_var: NPM_AI_PATH
ai_id: 014c22bd-4107-459e-8475-67909e96edcb
ai_id_var: NPM_AI_ID
steps:
- template: ../containers/container-template-windows.yaml
parameters:
name: $(name)
arch: $(arch)
tag: $(TAG)
ai_path: $(ai_path)
ai_path_var: $(ai_path_var)
ai_id: $(ai_id)
ai_id_var: $(ai_id_var)

- job: k8se2e
displayName: "Build Kubernetes Test Suite"
Expand Down
12 changes: 12 additions & 0 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,26 @@ stages:
cns_windows_amd64:
arch: amd64
name: cns
ai_path: github.com/Azure/azure-container-networking/cns/logger.aiMetadata
ai_path_var: CNS_AI_PATH
ai_id: ce672799-8f08-4235-8c12-08563dc2acef
ai_id_var: CNS_AI_ID
npm_windows_amd64:
arch: amd64
name: npm
ai_path: github.com/Azure/azure-container-networking/npm.aiMetadata
ai_path_var: NPM_AI_PATH
ai_id: 014c22bd-4107-459e-8475-67909e96edcb
ai_id_var: NPM_AI_ID
steps:
- template: containers/container-template-windows.yaml
parameters:
name: $(name)
arch: $(arch)
ai_path: $(ai_path)
ai_path_var: $(ai_path_var)
ai_id: $(ai_id)
ai_id_var: $(ai_id_var)
tag: $(TAG)
- job: check_tag
displayName: Check Tag
Expand Down
12 changes: 12 additions & 0 deletions .pipelines/submodules-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,27 @@ stages:
cns_windows_amd64:
arch: amd64
name: cns
ai_path: github.com/Azure/azure-container-networking/cns/logger.aiMetadata
ai_path_var: CNS_AI_PATH
ai_id: ce672799-8f08-4235-8c12-08563dc2acef
ai_id_var: CNS_AI_ID
npm_windows_amd64:
arch: amd64
name: npm
ai_path: github.com/Azure/azure-container-networking/npm.aiMetadata
ai_path_var: NPM_AI_PATH
ai_id: 014c22bd-4107-459e-8475-67909e96edcb
ai_id_var: NPM_AI_ID
steps:
- template: containers/container-template-windows.yaml
parameters:
name: $(name)
arch: $(arch)
tag: $(TAG)
ai_path: $(ai_path)
ai_path_var: $(ai_path_var)
ai_id: $(ai_id)
ai_id_var: $(ai_id_var)

- stage: publish
displayName: Publish Multiarch Manifests
Expand Down