From 30c63d48122be07685fe4b0568ff08fe98bf9e4f Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Wed, 23 Oct 2019 17:26:19 -0700 Subject: [PATCH 01/25] save cluster configs --- .pipelines/Dockerfile | 2 +- .pipelines/e2e-job-template.yaml | 1 + .pipelines/e2e-step-template.yaml | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.pipelines/Dockerfile b/.pipelines/Dockerfile index 65815fc384..a5f06e74eb 100644 --- a/.pipelines/Dockerfile +++ b/.pipelines/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-transport-https curl lsb-release gnupg +RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-transport-https curl lsb-release gnupg jq RUN wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb RUN sudo dpkg -i packages-microsoft-prod.deb RUN add-apt-repository ppa:longsleep/golang-backports diff --git a/.pipelines/e2e-job-template.yaml b/.pipelines/e2e-job-template.yaml index 10edd32538..45de644d4b 100644 --- a/.pipelines/e2e-job-template.yaml +++ b/.pipelines/e2e-job-template.yaml @@ -24,6 +24,7 @@ jobs: steps: - template: e2e-step-template.yaml parameters: + name: ${{ parameters.name }} clusterDefinitionUrl: ${{ parameters.clusterDefinitionUrl }} clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }} clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }} diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 4b109901a0..63e0eae986 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -50,6 +50,16 @@ steps: export REGIONS=$(AKS_ENGINE_REGION) export IS_JENKINS=false make test-kubernetes + mkdir -p $(Build.ArtifactStagingDirectory)/kube-${{ parameters.name }} + cp -r _output/k*/kubeconfig/kubeconfig.$REGIONS.json $(Build.ArtifactStagingDirectory)/kube-${{ parameters.name }} + cp -r _output/kubernetes-*-ssh $(Build.ArtifactStagingDirectory)/kube-${{ parameters.name }} name: DeployAKSEngine displayName: Deploy AKS-Engine workingDirectory: "$(modulePath)" + + - task: PublishBuildArtifacts@1 + inputs: + artifactName: "kube-${{ parameters.name }}" + pathtoPublish: "$(Build.ArtifactStagingDirectory)/kube-${{ parameters.name }}" + displayName: "Save cluster configs" + condition: always() From 5007646d96e84bbda6216cd05545b2b5d2ff38fa Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Wed, 23 Oct 2019 17:35:05 -0700 Subject: [PATCH 02/25] always clean up --- .pipelines/pipeline.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 80ee7264e6..0e8bc3c471 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -169,6 +169,7 @@ stages: clusterDefinitionCniBuildExt: ".zip" - stage: cleanup + condition: always() jobs: - job: delete_remote_artifacts pool: @@ -178,7 +179,7 @@ stages: image: containernetworking/pipeline-ci:1.0.4 variables: Tag: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.Tag'] ] - + condition: always() steps: - checkout: none - task: AzureCLI@1 @@ -190,3 +191,4 @@ stages: az storage container delete -n acn-$CommitHash --account-name $(STORAGE_ACCOUNT_NAME) workingDirectory: "$(modulePath)" displayName: Cleanup remote Azure storage container + condition: always() From 8e7431d3fb703e6fff1a0b0fe9a717d340ad1918 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 13:13:53 -0700 Subject: [PATCH 03/25] add more e2e scenarios --- .pipelines/e2e-job-template.yaml | 1 + .pipelines/e2e-step-template.yaml | 4 +- .pipelines/pipeline.yaml | 35 +++++++++++++-- test/e2e/kubernetes/cniLinux.json | 42 ------------------ test/e2e/kubernetes/cniLinux1604.json | 44 +++++++++++++++++++ test/e2e/kubernetes/cniLinux18.json | 44 ------------------- test/e2e/kubernetes/cniLinux1804.json | 44 +++++++++++++++++++ test/e2e/kubernetes/cniWindows.json | 54 ----------------------- test/e2e/kubernetes/cniWindows1803.json | 58 +++++++++++++++++++++++++ test/e2e/kubernetes/cniWindows1903.json | 58 +++++++++++++++++++++++++ 10 files changed, 238 insertions(+), 146 deletions(-) delete mode 100644 test/e2e/kubernetes/cniLinux.json create mode 100644 test/e2e/kubernetes/cniLinux1604.json delete mode 100644 test/e2e/kubernetes/cniLinux18.json create mode 100644 test/e2e/kubernetes/cniLinux1804.json delete mode 100644 test/e2e/kubernetes/cniWindows.json create mode 100644 test/e2e/kubernetes/cniWindows1803.json create mode 100644 test/e2e/kubernetes/cniWindows1903.json diff --git a/.pipelines/e2e-job-template.yaml b/.pipelines/e2e-job-template.yaml index 45de644d4b..ac341978f3 100644 --- a/.pipelines/e2e-job-template.yaml +++ b/.pipelines/e2e-job-template.yaml @@ -18,6 +18,7 @@ jobs: GOPATH: "$(System.DefaultWorkingDirectory)/gopath" GOBIN: "$(GOPATH)/bin" # Go binaries path modulePath: "$(GOPATH)/src/github.com/Azure/aks-engine" + acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking" Tag: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.Tag'] ] CommitHash: $[ dependencies.unit_tests.outputs['EnvironmentalVariables.CommitHash'] ] diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 63e0eae986..ab66493644 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -1,6 +1,6 @@ parameters: name: "" - clusterDefinitionUrl: "" + clusterDefinition: "" clusterDefinitionCniTypeKey: "" clusterDefinitionCniBuildOS: "" clusterDefinitionCniBuildExt: "" @@ -21,7 +21,7 @@ steps: - bash: | rm -f clusterDefinition.json* - wget '${{ parameters.clusterDefinitionUrl }}' -O clusterDefinition.json + cp $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' clusterDefinition.json export CNI_URL='"'https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(CommitHash)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-$(Tag)${{ parameters.clusterDefinitionCniBuildExt }}'"' export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} echo CNI type is $CNI_TYPE diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 0e8bc3c471..0e019f1123 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -153,17 +153,44 @@ stages: - template: e2e-job-template.yaml parameters: name: "ubuntu_16_04_linux_e2e" - pipelineBuildImage: "containernetworking/pipeline-ci:1.0.4" - clusterDefinitionUrl: "https://raw.githubusercontent.com/Azure/azure-container-networking/master/test/e2e/kubernetes/cniLinux.json" + pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" + clusterDefinition: "cniLinux1604.json" clusterDefinitionCniTypeKey: "azureCNIURLLinux" clusterDefinitionCniBuildOS: "linux" clusterDefinitionCniBuildExt: ".tgz" + - template: e2e-job-template.yaml + parameters: + name: "ubuntu_18_04_linux_e2e" + pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" + clusterDefinition: "cniLinux1804.json" + clusterDefinitionCniTypeKey: "azureCNIURLLinux" + clusterDefinitionCniBuildOS: "linux" + clusterDefinitionCniBuildExt: ".tgz" + + - template: e2e-job-template.yaml + parameters: + name: "windows_18_03_e2e" + pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" + clusterDefinition: "cniWindows1803.json" + clusterDefinitionCniTypeKey: "azureCNIURLWindows" + clusterDefinitionCniBuildOS: "windows" + clusterDefinitionCniBuildExt: ".zip" + + - template: e2e-job-template.yaml + parameters: + name: "windows_19_03_e2e" + pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" + clusterDefinition: "cniWindows1903.json" + clusterDefinitionCniTypeKey: "azureCNIURLWindows" + clusterDefinitionCniBuildOS: "windows" + clusterDefinitionCniBuildExt: ".zip" + - template: e2e-job-template.yaml parameters: name: "windows_e2e" - pipelineBuildImage: "containernetworking/pipeline-ci:1.0.4" - clusterDefinitionUrl: "https://raw.githubusercontent.com/Azure/azure-container-networking/master/test/e2e/kubernetes/cniWindows.json" + pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" + clusterDefinition: "cniWindows1903.json" clusterDefinitionCniTypeKey: "azureCNIURLWindows" clusterDefinitionCniBuildOS: "windows" clusterDefinitionCniBuildExt: ".zip" diff --git a/test/e2e/kubernetes/cniLinux.json b/test/e2e/kubernetes/cniLinux.json deleted file mode 100644 index b23be68ed9..0000000000 --- a/test/e2e/kubernetes/cniLinux.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "apiVersion":"vlabs", - "properties":{ - "orchestratorProfile":{ - "orchestratorType":"Kubernetes", - "orchestratorRelease":"1.14", - "kubernetesConfig":{ - "networkPlugin":"azure", - "networkPolicy":"azure", - "azureCNIVersion":"", - "azureCNIURLLinux":"" - } - }, - "masterProfile":{ - "count":1, - "dnsPrefix":"cniLinux", - "vmSize":"Standard_D2_v2" - }, - "agentPoolProfiles":[ - { - "name":"agentpool1", - "count":3, - "vmSize":"Standard_D2_v2", - "availabilityProfile":"AvailabilitySet" - } - ], - "linuxProfile":{ - "adminUsername":"azureuser", - "ssh":{ - "publicKeys":[ - { - "keyData":"" - } - ] - } - }, - "servicePrincipalProfile":{ - "clientId":"", - "secret":"" - } - } -} \ No newline at end of file diff --git a/test/e2e/kubernetes/cniLinux1604.json b/test/e2e/kubernetes/cniLinux1604.json new file mode 100644 index 0000000000..5e923a4811 --- /dev/null +++ b/test/e2e/kubernetes/cniLinux1604.json @@ -0,0 +1,44 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.14", + "kubernetesConfig": { + "networkPlugin": "azure", + "networkPolicy": "azure", + "azureCNIVersion": "", + "azureCNIURLLinux": "" + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "cniLinux", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agentpool1", + "count": 3, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Linux", + "distro": "aks-ubuntu-16.04" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } +} \ No newline at end of file diff --git a/test/e2e/kubernetes/cniLinux18.json b/test/e2e/kubernetes/cniLinux18.json deleted file mode 100644 index 97367865cd..0000000000 --- a/test/e2e/kubernetes/cniLinux18.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "apiVersion":"vlabs", - "properties":{ - "orchestratorProfile":{ - "orchestratorType":"Kubernetes", - "orchestratorRelease":"1.14", - "kubernetesConfig":{ - "networkPlugin":"azure", - "networkPolicy":"azure", - "azureCNIVersion":"", - "azureCNIURLLinux":"" - } - }, - "masterProfile":{ - "count":1, - "dnsPrefix":"cniLinux", - "vmSize":"Standard_D2_v2" - }, - "agentPoolProfiles":[ - { - "name":"agentpool1", - "count":3, - "vmSize":"Standard_D2_v2", - "osType": "Linux", - "distro": "aks-ubuntu-18.04", - "availabilityProfile":"AvailabilitySet" - } - ], - "linuxProfile":{ - "adminUsername":"azureuser", - "ssh":{ - "publicKeys":[ - { - "keyData":"" - } - ] - } - }, - "servicePrincipalProfile":{ - "clientId":"", - "secret":"" - } - } -} \ No newline at end of file diff --git a/test/e2e/kubernetes/cniLinux1804.json b/test/e2e/kubernetes/cniLinux1804.json new file mode 100644 index 0000000000..59ed4f7851 --- /dev/null +++ b/test/e2e/kubernetes/cniLinux1804.json @@ -0,0 +1,44 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.14", + "kubernetesConfig": { + "networkPlugin": "azure", + "networkPolicy": "azure", + "azureCNIVersion": "", + "azureCNIURLLinux": "" + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "cniLinux", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agentpool1", + "count": 3, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Linux", + "distro": "aks-ubuntu-18.04" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } +} \ No newline at end of file diff --git a/test/e2e/kubernetes/cniWindows.json b/test/e2e/kubernetes/cniWindows.json deleted file mode 100644 index 0ab46f392f..0000000000 --- a/test/e2e/kubernetes/cniWindows.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "apiVersion":"vlabs", - "properties":{ - "orchestratorProfile":{ - "orchestratorType":"Kubernetes", - "orchestratorRelease":"1.14", - "kubernetesConfig":{ - "networkPlugin":"azure", - "networkPolicy":"azure", - "azureCNIVersion":"", - "azureCNIURLWindows":"" - } - }, - "masterProfile":{ - "count":1, - "dnsPrefix":"cniWindows", - "vmSize":"Standard_D2_v2" - }, - "agentPoolProfiles":[ - { - "name":"windowspool2", - "count":2, - "vmSize":"Standard_D2_v2", - "availabilityProfile":"AvailabilitySet", - "osType":"Windows", - "extensions":[ - { - "name":"windows-patches" - } - ] - } - ], - "windowsProfile":{ - "adminUsername":"azureuser", - "adminPassword":"azureTest@!", - "enableAutomaticUpdates":false, - "sshEnabled":true - }, - "linuxProfile":{ - "adminUsername":"azureuser", - "ssh":{ - "publicKeys":[ - { - "keyData":"" - } - ] - } - }, - "servicePrincipalProfile":{ - "clientId":"", - "secret":"" - } - } -} \ No newline at end of file diff --git a/test/e2e/kubernetes/cniWindows1803.json b/test/e2e/kubernetes/cniWindows1803.json new file mode 100644 index 0000000000..b70930dbe6 --- /dev/null +++ b/test/e2e/kubernetes/cniWindows1803.json @@ -0,0 +1,58 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.14", + "kubernetesConfig": { + "networkPlugin": "azure", + "networkPolicy": "azure", + "azureCNIVersion": "", + "azureCNIURLWindows": "" + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "cniWindows", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "windowspool2", + "count": 2, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Windows", + "extensions": [ + { + "name": "windows-patches" + } + ] + } + ], + "windowsProfile": { + "adminUsername": "azureuser", + "adminPassword": "azureTest@!", + "enableAutomaticUpdates": false, + "sshEnabled": true, + "windowsPublisher": "MicrosoftWindowsServer", + "windowsOffer": "WindowsServer", + "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", + "imageVersion": "1803.0.20190711" + }, + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } +} \ No newline at end of file diff --git a/test/e2e/kubernetes/cniWindows1903.json b/test/e2e/kubernetes/cniWindows1903.json new file mode 100644 index 0000000000..0bcaa498af --- /dev/null +++ b/test/e2e/kubernetes/cniWindows1903.json @@ -0,0 +1,58 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.14", + "kubernetesConfig": { + "networkPlugin": "azure", + "networkPolicy": "azure", + "azureCNIVersion": "", + "azureCNIURLWindows": "" + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "cniWindows", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "windowspool2", + "count": 2, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Windows", + "extensions": [ + { + "name": "windows-patches" + } + ] + } + ], + "windowsProfile": { + "adminUsername": "azureuser", + "adminPassword": "azureTest@!", + "enableAutomaticUpdates": false, + "sshEnabled": true, + "windowsPublisher": "MicrosoftWindowsServer", + "windowsOffer": "WindowsServer", + "windowsSku": "Datacenter-Core-1903-with-Containers-smalldisk", + "imageVersion": "1903.0.20190603" + }, + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } +} \ No newline at end of file From a9c771a3e397edb28eb973b29901bca783a7db33 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 13:16:17 -0700 Subject: [PATCH 04/25] remove extra e2e --- .pipelines/pipeline.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 0e019f1123..24242f3331 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -186,15 +186,6 @@ stages: clusterDefinitionCniBuildOS: "windows" clusterDefinitionCniBuildExt: ".zip" - - template: e2e-job-template.yaml - parameters: - name: "windows_e2e" - pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" - clusterDefinition: "cniWindows1903.json" - clusterDefinitionCniTypeKey: "azureCNIURLWindows" - clusterDefinitionCniBuildOS: "windows" - clusterDefinitionCniBuildExt: ".zip" - - stage: cleanup condition: always() jobs: From b2e41a528daa2359603efe8438a0f09b38261be9 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 13:37:26 -0700 Subject: [PATCH 05/25] debugging lines --- .pipelines/e2e-step-template.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index ab66493644..487e9e69db 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -21,10 +21,13 @@ steps: - bash: | rm -f clusterDefinition.json* - cp $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' clusterDefinition.json export CNI_URL='"'https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(CommitHash)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-$(Tag)${{ parameters.clusterDefinitionCniBuildExt }}'"' export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} echo CNI type is $CNI_TYPE + echo path $(acnPath)/test/e2e/kubernetes/ + ls cat $(acnPath)/test/e2e/kubernetes/ + cat $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' + cp $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' clusterDefinition.json sed -i "s|\"$CNI_TYPE\":\".*\"|\"$CNI_TYPE\":$CNI_URL|g" clusterDefinition.json sed -i "s|\"azureCNIVersion\":\".*\"|\"azureCNIVersion\":\"$(Tag)\"|g" clusterDefinition.json echo "Running E2E tests against a cluster built with the following API model:" From 13e3e6ae33811bf1862d237ada1190c377eb7d3b Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 14:09:31 -0700 Subject: [PATCH 06/25] publish e2e cluster definitions to pipeline --- .pipelines/e2e-step-template.yaml | 10 ++++++++-- .pipelines/pipeline.yaml | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 487e9e69db..12502619a9 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -19,15 +19,21 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" + - task: DownloadPipelineArtifact@2 + inputs: + buildType: "current" + artifactName: clusterdefinitions + targetPath: "$(Pipeline.Workspace)" + - bash: | rm -f clusterDefinition.json* export CNI_URL='"'https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(CommitHash)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-$(Tag)${{ parameters.clusterDefinitionCniBuildExt }}'"' export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} echo CNI type is $CNI_TYPE echo path $(acnPath)/test/e2e/kubernetes/ - ls cat $(acnPath)/test/e2e/kubernetes/ + ls $(acnPath)/test/e2e/kubernetes/ cat $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' - cp $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' clusterDefinition.json + cp '$(Pipeline.Workspace)'/'${{ parameters.clusterDefinition }}' clusterDefinition.json sed -i "s|\"$CNI_TYPE\":\".*\"|\"$CNI_TYPE\":$CNI_URL|g" clusterDefinition.json sed -i "s|\"azureCNIVersion\":\".*\"|\"azureCNIVersion\":\"$(Tag)\"|g" clusterDefinition.json echo "Running E2E tests against a cluster built with the following API model:" diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 24242f3331..0dcc62ea05 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -80,6 +80,7 @@ stages: displayName: "Install Go dependencies" - script: | + echo Building in $(pwd) echo Build tag is $(EnvironmentalVariables.Tag) export GOOS=linux make all-binaries VERSION=$(EnvironmentalVariables.Tag) @@ -140,6 +141,13 @@ stages: pathtoPublish: "$(Build.ArtifactStagingDirectory)" condition: succeeded() + - task: PublishPipelineArtifact@1 + inputs: + targetPath: "$(modulePath)/test/e2e/kubernetes/*" # '$(Pipeline.Workspace)' + artifact: "clusterdefinitions" + publishLocation: "pipeline" + displayName: "Publish cluster definitions for e2e tests" + - task: AzureCLI@1 inputs: azureSubscription: $(ARTIFACT_SUBSCRIPTION) From 8ff7fd8644fe22284cd54afa5cd35e47bac67e74 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 14:19:05 -0700 Subject: [PATCH 07/25] publish e2e cluster definitions to pipeline --- .pipelines/pipeline.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 0dcc62ea05..ccc59414a9 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -112,6 +112,8 @@ stages: bash <(curl -s https://codecov.io/bash) gocov convert coverage.out > coverage.json gocov-xml < coverage.json > coverage.xml + echo listing cluster definitions + ls '$(modulePath)/test/e2e/kubernetes/*' workingDirectory: "$(modulePath)" name: "Coverage" displayName: "Generate Coverage Reports" From 6509e54425dffb3059d3089d3a1421e2be1523be Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 14:19:21 -0700 Subject: [PATCH 08/25] publish e2e cluster definitions to pipeline --- .pipelines/pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index ccc59414a9..2096a73c38 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -113,7 +113,7 @@ stages: gocov convert coverage.out > coverage.json gocov-xml < coverage.json > coverage.xml echo listing cluster definitions - ls '$(modulePath)/test/e2e/kubernetes/*' + ls $(modulePath)/test/e2e/kubernetes/* workingDirectory: "$(modulePath)" name: "Coverage" displayName: "Generate Coverage Reports" From bba8859ae86b37f92e504159544fb963fc4a4cc8 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 14:29:46 -0700 Subject: [PATCH 09/25] publish e2e cluster definitions to pipeline --- .pipelines/pipeline.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 2096a73c38..b89d26388a 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -143,12 +143,8 @@ stages: pathtoPublish: "$(Build.ArtifactStagingDirectory)" condition: succeeded() - - task: PublishPipelineArtifact@1 - inputs: - targetPath: "$(modulePath)/test/e2e/kubernetes/*" # '$(Pipeline.Workspace)' - artifact: "clusterdefinitions" - publishLocation: "pipeline" - displayName: "Publish cluster definitions for e2e tests" + - publish: $(modulePath)/test/e2e/kubernetes/ + artifact: clusterdefinitions - task: AzureCLI@1 inputs: From 1153257e6f350ae3041e8a7c82873b5923a5daf2 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 14:35:00 -0700 Subject: [PATCH 10/25] publish e2e cluster definitions to pipeline --- .pipelines/e2e-step-template.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 12502619a9..026a014ea5 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -19,11 +19,9 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" - - task: DownloadPipelineArtifact@2 - inputs: - buildType: "current" - artifactName: clusterdefinitions - targetPath: "$(Pipeline.Workspace)" + - download: current + artifact: clusterdefinitions + patterns: "${{ parameters.clusterDefinition }}.js" - bash: | rm -f clusterDefinition.json* @@ -31,9 +29,9 @@ steps: export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} echo CNI type is $CNI_TYPE echo path $(acnPath)/test/e2e/kubernetes/ - ls $(acnPath)/test/e2e/kubernetes/ - cat $(acnPath)/test/e2e/kubernetes/'${{ parameters.clusterDefinition }}' - cp '$(Pipeline.Workspace)'/'${{ parameters.clusterDefinition }}' clusterDefinition.json + ls clusterdefinitions + cat clusterdefinitions/${{ parameters.clusterDefinition }}' + cp clusterdefinitions/'${{ parameters.clusterDefinition }}' clusterDefinition.json sed -i "s|\"$CNI_TYPE\":\".*\"|\"$CNI_TYPE\":$CNI_URL|g" clusterDefinition.json sed -i "s|\"azureCNIVersion\":\".*\"|\"azureCNIVersion\":\"$(Tag)\"|g" clusterDefinition.json echo "Running E2E tests against a cluster built with the following API model:" From 9a0d55be3569baf195fa968317a19ddabc7c9734 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 15:16:05 -0700 Subject: [PATCH 11/25] debugging lines --- .pipelines/e2e-step-template.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 026a014ea5..410d5369c6 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -22,8 +22,10 @@ steps: - download: current artifact: clusterdefinitions patterns: "${{ parameters.clusterDefinition }}.js" + targetPath: "$(Pipeline.Workspace)" - bash: | + ls -lah rm -f clusterDefinition.json* export CNI_URL='"'https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(CommitHash)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-$(Tag)${{ parameters.clusterDefinitionCniBuildExt }}'"' export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} From 6e80c55f3fdd63d213f9d4f93a3801ae12743876 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 15:18:03 -0700 Subject: [PATCH 12/25] debugging lines --- .pipelines/e2e-step-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 410d5369c6..5fff9d71fd 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -22,7 +22,7 @@ steps: - download: current artifact: clusterdefinitions patterns: "${{ parameters.clusterDefinition }}.js" - targetPath: "$(Pipeline.Workspace)" + targetPath: "$(modulePath)" - bash: | ls -lah From 14f7ef5b9d57084115d6d89a55e8459dfa0ceea7 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 15:20:38 -0700 Subject: [PATCH 13/25] debugging lines --- .pipelines/e2e-step-template.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 5fff9d71fd..02535d2bc8 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -19,10 +19,9 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" - - download: current - artifact: clusterdefinitions - patterns: "${{ parameters.clusterDefinition }}.js" - targetPath: "$(modulePath)" + - task: DownloadPipelineArtifact@2 + buildType: current + artifactName: clusterdefinitions - bash: | ls -lah From bdc838d8400814071614636196b0b1f1c8468efe Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 15:21:53 -0700 Subject: [PATCH 14/25] debugging lines --- .pipelines/e2e-step-template.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 02535d2bc8..5e7a12303c 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -20,8 +20,11 @@ steps: displayName: "Set up the Go environment" - task: DownloadPipelineArtifact@2 - buildType: current - artifactName: clusterdefinitions + inputs: + buildType: current + artifactName: clusterdefinitions + #buildType: 'current' # Options: current, specific + #project: # Required when buildType == Specific - bash: | ls -lah From f943ffcff2af205f7b4e24f1f2fcebfe517b017b Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Fri, 25 Oct 2019 15:34:06 -0700 Subject: [PATCH 15/25] debugging lines --- .pipelines/e2e-step-template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 5e7a12303c..5398e29438 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -23,6 +23,7 @@ steps: inputs: buildType: current artifactName: clusterdefinitions + targetPath: "$(modulePath)" #buildType: 'current' # Options: current, specific #project: # Required when buildType == Specific From 79ca4ef354b4b683f7fda119ee9a8a8a14a1c752 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 11:21:47 -0700 Subject: [PATCH 16/25] cluster definition --- .pipelines/e2e-job-template.yaml | 4 ++-- .pipelines/e2e-step-template.yaml | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.pipelines/e2e-job-template.yaml b/.pipelines/e2e-job-template.yaml index ac341978f3..456dfdfaa1 100644 --- a/.pipelines/e2e-job-template.yaml +++ b/.pipelines/e2e-job-template.yaml @@ -1,7 +1,7 @@ parameters: name: "" pipelineBuildImage: "containernetworking/pipeline-ci:1.0.4" - clusterDefinitionUrl: "https://raw.githubusercontent.com/Azure/azure-container-networking/master/test/e2e/kubernetes/cniLinux.json" + clusterDefinition: "" clusterDefinitionCniTypeKey: "" clusterDefinitionCniBuildOS: "" clusterDefinitionCniBuildExt: "" @@ -26,7 +26,7 @@ jobs: - template: e2e-step-template.yaml parameters: name: ${{ parameters.name }} - clusterDefinitionUrl: ${{ parameters.clusterDefinitionUrl }} + clusterDefinition: ${{ parameters.clusterDefinition }} clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }} clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }} clusterDefinitionCniBuildExt: ${{ parameters.clusterDefinitionCniBuildExt }} diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 5398e29438..ff27d0013d 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -29,18 +29,14 @@ steps: - bash: | ls -lah - rm -f clusterDefinition.json* export CNI_URL='"'https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(CommitHash)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-$(Tag)${{ parameters.clusterDefinitionCniBuildExt }}'"' export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} echo CNI type is $CNI_TYPE - echo path $(acnPath)/test/e2e/kubernetes/ - ls clusterdefinitions - cat clusterdefinitions/${{ parameters.clusterDefinition }}' - cp clusterdefinitions/'${{ parameters.clusterDefinition }}' clusterDefinition.json - sed -i "s|\"$CNI_TYPE\":\".*\"|\"$CNI_TYPE\":$CNI_URL|g" clusterDefinition.json - sed -i "s|\"azureCNIVersion\":\".*\"|\"azureCNIVersion\":\"$(Tag)\"|g" clusterDefinition.json + sed -i "s|\"$CNI_TYPE\":\".*\"|\"$CNI_TYPE\":$CNI_URL|g" '${{ parameters.clusterDefinition }}' + sed -i "s|\"azureCNIVersion\":\".*\"|\"azureCNIVersion\":\"$(Tag)\"|g" '${{ parameters.clusterDefinition }}' echo "Running E2E tests against a cluster built with the following API model:" - cat ./clusterDefinition.json + cat '${{ parameters.clusterDefinition }}' + cp ${{ parameters.clusterDefinition }} clusterDefinition.json curl -L https://dl.k8s.io/v1.16.0/kubernetes-client-linux-amd64.tar.gz | tar xvzf - sudo cp kubernetes/client/bin/kubectl /usr/local/bin/kubectl sudo cp kubernetes/client/bin/kubectl /usr/local/bin/k @@ -50,7 +46,7 @@ steps: workingDirectory: "$(modulePath)" - bash: | - export CLUSTER_DEFINITION=./clusterDefinition.json + export CLUSTER_DEFINITION=./'${{ parameters.clusterDefinition }}' export ORCHESTRATOR=kubernetes export CREATE_VNET=false export TIMEOUT=10m From 106bc411b2bba201c19766acb8c2ecb2992f26b6 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 13:43:26 -0700 Subject: [PATCH 17/25] change windows 1803 image version --- .pipelines/e2e-step-template.yaml | 1 + test/e2e/kubernetes/cniWindows1803.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index ff27d0013d..1dd1dfb48b 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -63,6 +63,7 @@ steps: cp -r _output/kubernetes-*-ssh $(Build.ArtifactStagingDirectory)/kube-${{ parameters.name }} name: DeployAKSEngine displayName: Deploy AKS-Engine + failOnStderr: true workingDirectory: "$(modulePath)" - task: PublishBuildArtifacts@1 diff --git a/test/e2e/kubernetes/cniWindows1803.json b/test/e2e/kubernetes/cniWindows1803.json index b70930dbe6..ba8f340894 100644 --- a/test/e2e/kubernetes/cniWindows1803.json +++ b/test/e2e/kubernetes/cniWindows1803.json @@ -38,7 +38,7 @@ "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", - "imageVersion": "1803.0.20190711" + "imageVersion": "1803.0.20190613" }, "linuxProfile": { "adminUsername": "azureuser", From 2ec6e19d1f38a3da9906b4b4a92e8c07e4dae2e5 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 14:43:48 -0700 Subject: [PATCH 18/25] windows version --- test/e2e/kubernetes/cniWindows1803.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/cniWindows1803.json b/test/e2e/kubernetes/cniWindows1803.json index ba8f340894..582302ab2a 100644 --- a/test/e2e/kubernetes/cniWindows1803.json +++ b/test/e2e/kubernetes/cniWindows1803.json @@ -38,7 +38,7 @@ "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", - "imageVersion": "1803.0.20190613" + "imageVersion": "1803.0.20190115" }, "linuxProfile": { "adminUsername": "azureuser", From d0233a158dfcd37a847bbdff5626103d714f14ed Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 15:04:11 -0700 Subject: [PATCH 19/25] windows version --- .pipelines/pipeline.yaml | 4 ++-- .../kubernetes/{cniWindows1803.json => cniWindows1809.json} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/kubernetes/{cniWindows1803.json => cniWindows1809.json} (91%) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index b89d26388a..0973c50c12 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -176,9 +176,9 @@ stages: - template: e2e-job-template.yaml parameters: - name: "windows_18_03_e2e" + name: "windows_18_09_e2e" pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" - clusterDefinition: "cniWindows1803.json" + clusterDefinition: "cniWindows1809.json" clusterDefinitionCniTypeKey: "azureCNIURLWindows" clusterDefinitionCniBuildOS: "windows" clusterDefinitionCniBuildExt: ".zip" diff --git a/test/e2e/kubernetes/cniWindows1803.json b/test/e2e/kubernetes/cniWindows1809.json similarity index 91% rename from test/e2e/kubernetes/cniWindows1803.json rename to test/e2e/kubernetes/cniWindows1809.json index 582302ab2a..11eed95e58 100644 --- a/test/e2e/kubernetes/cniWindows1803.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -37,8 +37,8 @@ "sshEnabled": true, "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", - "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", - "imageVersion": "1803.0.20190115" + "windowsSku": "WindowsServer:Datacenter-Core-1809-with-Containers-smalldisk", + "imageVersion": "1809.0.20190603 " }, "linuxProfile": { "adminUsername": "azureuser", From 154f422de8c572d0f80a57a177be7562291a1edb Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 15:19:18 -0700 Subject: [PATCH 20/25] windows version --- .pipelines/e2e-step-template.yaml | 1 - .pipelines/pipeline.yaml | 1 - test/e2e/kubernetes/cniWindows1809.json | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pipelines/e2e-step-template.yaml b/.pipelines/e2e-step-template.yaml index 1dd1dfb48b..ff27d0013d 100644 --- a/.pipelines/e2e-step-template.yaml +++ b/.pipelines/e2e-step-template.yaml @@ -63,7 +63,6 @@ steps: cp -r _output/kubernetes-*-ssh $(Build.ArtifactStagingDirectory)/kube-${{ parameters.name }} name: DeployAKSEngine displayName: Deploy AKS-Engine - failOnStderr: true workingDirectory: "$(modulePath)" - task: PublishBuildArtifacts@1 diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 0973c50c12..5d4fe31f6a 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -104,7 +104,6 @@ stages: } | { read xs; exit $xs; } } 4>&1 workingDirectory: "$(modulePath)" - failOnStderr: true name: "Test" displayName: "Run Tests" diff --git a/test/e2e/kubernetes/cniWindows1809.json b/test/e2e/kubernetes/cniWindows1809.json index 11eed95e58..c34f7b1974 100644 --- a/test/e2e/kubernetes/cniWindows1809.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -38,7 +38,7 @@ "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", "windowsSku": "WindowsServer:Datacenter-Core-1809-with-Containers-smalldisk", - "imageVersion": "1809.0.20190603 " + "imageVersion": "1809.0.20190603" }, "linuxProfile": { "adminUsername": "azureuser", From 6c9c9f2ac28a63fb263d863a18d7da917ec91dd5 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 15:36:13 -0700 Subject: [PATCH 21/25] windows version --- test/e2e/kubernetes/cniWindows1809.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/kubernetes/cniWindows1809.json b/test/e2e/kubernetes/cniWindows1809.json index c34f7b1974..ab6b7b22ec 100644 --- a/test/e2e/kubernetes/cniWindows1809.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -37,8 +37,8 @@ "sshEnabled": true, "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", - "windowsSku": "WindowsServer:Datacenter-Core-1809-with-Containers-smalldisk", - "imageVersion": "1809.0.20190603" + "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk", + "imageVersion": "1809.0.20190826" }, "linuxProfile": { "adminUsername": "azureuser", From d04ddbf29fba939af446b64f1fa79e125c627ac3 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 15:57:40 -0700 Subject: [PATCH 22/25] windows version --- test/e2e/kubernetes/cniWindows1809.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/cniWindows1809.json b/test/e2e/kubernetes/cniWindows1809.json index ab6b7b22ec..43957aba9f 100644 --- a/test/e2e/kubernetes/cniWindows1809.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -36,7 +36,7 @@ "enableAutomaticUpdates": false, "sshEnabled": true, "windowsPublisher": "MicrosoftWindowsServer", - "windowsOffer": "WindowsServer", + "windowsOffer": "WindowsServerSemiAnnual", "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk", "imageVersion": "1809.0.20190826" }, From 44a6df7be1747dc8ff055fd757c382bb0d5cc01b Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 16:13:54 -0700 Subject: [PATCH 23/25] windows version --- .pipelines/pipeline.yaml | 4 ++-- .../{cniWindows1809.json => cniWindows1803.json} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename test/e2e/kubernetes/{cniWindows1809.json => cniWindows1803.json} (86%) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 5d4fe31f6a..77315b6a54 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -175,9 +175,9 @@ stages: - template: e2e-job-template.yaml parameters: - name: "windows_18_09_e2e" + name: "windows_18_03_e2e" pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" - clusterDefinition: "cniWindows1809.json" + clusterDefinition: "cniWindows1803.json" clusterDefinitionCniTypeKey: "azureCNIURLWindows" clusterDefinitionCniBuildOS: "windows" clusterDefinitionCniBuildExt: ".zip" diff --git a/test/e2e/kubernetes/cniWindows1809.json b/test/e2e/kubernetes/cniWindows1803.json similarity index 86% rename from test/e2e/kubernetes/cniWindows1809.json rename to test/e2e/kubernetes/cniWindows1803.json index 43957aba9f..923c59ff61 100644 --- a/test/e2e/kubernetes/cniWindows1809.json +++ b/test/e2e/kubernetes/cniWindows1803.json @@ -35,10 +35,10 @@ "adminPassword": "azureTest@!", "enableAutomaticUpdates": false, "sshEnabled": true, - "windowsPublisher": "MicrosoftWindowsServer", - "windowsOffer": "WindowsServerSemiAnnual", - "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk", - "imageVersion": "1809.0.20190826" + "windowsPublisher": "MicrosoftWindows", + "windowsOffer": "WindowsServer", + "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", + "imageVersion": "17134.950.1908092218" }, "linuxProfile": { "adminUsername": "azureuser", From f674664cba4b8db1af83c3cbe9cef64e2c664a6b Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 16:24:07 -0700 Subject: [PATCH 24/25] windows version --- test/e2e/kubernetes/cniWindows1803.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/cniWindows1803.json b/test/e2e/kubernetes/cniWindows1803.json index 923c59ff61..4fee01b18b 100644 --- a/test/e2e/kubernetes/cniWindows1803.json +++ b/test/e2e/kubernetes/cniWindows1803.json @@ -35,7 +35,7 @@ "adminPassword": "azureTest@!", "enableAutomaticUpdates": false, "sshEnabled": true, - "windowsPublisher": "MicrosoftWindows", + "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", "imageVersion": "17134.950.1908092218" From ac02e709c3875634ab863ee84c3feec18889f742 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 28 Oct 2019 17:28:24 -0700 Subject: [PATCH 25/25] windows version --- .pipelines/pipeline.yaml | 4 ++-- .../kubernetes/{cniWindows1803.json => cniWindows1809.json} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/kubernetes/{cniWindows1803.json => cniWindows1809.json} (92%) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 77315b6a54..5d4fe31f6a 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -175,9 +175,9 @@ stages: - template: e2e-job-template.yaml parameters: - name: "windows_18_03_e2e" + name: "windows_18_09_e2e" pipelineBuildImage: "containernetworking/pipeline-ci:1.0.5" - clusterDefinition: "cniWindows1803.json" + clusterDefinition: "cniWindows1809.json" clusterDefinitionCniTypeKey: "azureCNIURLWindows" clusterDefinitionCniBuildOS: "windows" clusterDefinitionCniBuildExt: ".zip" diff --git a/test/e2e/kubernetes/cniWindows1803.json b/test/e2e/kubernetes/cniWindows1809.json similarity index 92% rename from test/e2e/kubernetes/cniWindows1803.json rename to test/e2e/kubernetes/cniWindows1809.json index 4fee01b18b..1b43627917 100644 --- a/test/e2e/kubernetes/cniWindows1803.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -37,8 +37,8 @@ "sshEnabled": true, "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", - "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk", - "imageVersion": "17134.950.1908092218" + "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk", + "imageVersion": "1809.0.20190603" }, "linuxProfile": { "adminUsername": "azureuser",