diff --git a/.pipelines/containers/container-template-windows.yaml b/.pipelines/containers/container-template-windows.yaml index 7b641493f4..ac76cbef6e 100644 --- a/.pipelines/containers/container-template-windows.yaml +++ b/.pipelines/containers/container-template-windows.yaml @@ -12,6 +12,7 @@ steps: addPipelineData: false - powershell: | + echo "using tag ${{ parameters.tag }}" powershell.exe -command "& { . .\build\scripts\windows.ps1; Retry({${{ parameters.name }}-image windows-${{ parameters.arch }}-${{ parameters.tag }}}) }" name: image_build displayName: Image Build diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml index 98d676fe54..9f5808727e 100644 --- a/.pipelines/npm/npm-conformance-tests.yaml +++ b/.pipelines/npm/npm-conformance-tests.yaml @@ -75,6 +75,7 @@ jobs: parameters: name: $(name) arch: $(arch) + tag: $(TAG) - job: k8se2e displayName: "Build Kubernetes Test Suite" @@ -438,9 +439,18 @@ jobs: FQDN=`az aks show -n $CLUSTER_NAME -g $CLUSTER_NAME --query fqdn -o tsv` echo "##vso[task.setvariable variable=FQDN]$FQDN" - - bash: | + + + - script: | cat ~/.kube/config curl -fsSL github.com/mattfenwick/cyclonus/releases/latest/download/cyclonus_linux_amd64.tar.gz | tar -zxv + name: download_cyclonus + displayName: "Download Cyclonus" + failOnStderr: false + condition: always() + + + - script: | ./test/cyclonus/test-cyclonus-windows.sh name: cyclonus displayName: "Run Cyclonus Test"