diff --git a/.circleci/config.yml b/.circleci/config.yml index e03746e77c..46fb79aeec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -308,6 +308,34 @@ jobs: path: /go/src/github.com/Azure/acs-engine/_logs - store_artifacts: path: /go/src/github.com/Azure/acs-engine/_output + k8s-windows-1.10-release-e2e: + working_directory: /go/src/github.com/Azure/acs-engine + docker: + - image: quay.io/deis/go-dev:v1.9.0 + environment: + GOPATH: /go + steps: + - checkout + - run: | + echo 'export TIMEOUT=30m' >> $BASH_ENV + echo 'export ORCHESTRATOR_RELEASE=1.10' >> $BASH_ENV + echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/windows/definition.json' >> $BASH_ENV + echo 'export CLEANUP_ON_EXIT=false' >> $BASH_ENV + echo 'export RETAIN_SSH=false' >> $BASH_ENV + echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV + echo 'export CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_E2E_KUBERNETES}' >> $BASH_ENV + echo 'export CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET_E2E_KUBERNETES}' >> $BASH_ENV + - run: + name: compile + command: make build-binary + - run: + name: ginkgo k8s windows e2e tests + command: make test-kubernetes + no_output_timeout: "30m" + - store_artifacts: + path: /go/src/github.com/Azure/acs-engine/_logs + - store_artifacts: + path: /go/src/github.com/Azure/acs-engine/_output workflows: version: 2 build_and_test_pr: @@ -353,6 +381,12 @@ workflows: filters: branches: ignore: master + - k8s-windows-1.10-release-e2e: + requires: + - pr-e2e-hold + filters: + branches: + ignore: master - k8s-1.9-release-e2e: requires: - pr-e2e-hold diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 7046eb6604..22802ba892 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -188,8 +188,7 @@ func getAllKubernetesWindowsSupportedVersionsMap() map[string]bool { "1.7.1", "1.10.0-beta.2", "1.10.0-beta.4", - "1.10.0-rc.1", - "1.10.0"} { + "1.10.0-rc.1"} { ret[version] = false } return ret diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go index a77cd9c675..fc95b9f953 100644 --- a/pkg/api/vlabs/validate_test.go +++ b/pkg/api/vlabs/validate_test.go @@ -641,7 +641,7 @@ func TestWindowsVersions(t *testing.T) { } p = getK8sDefaultProperties(true) - p.OrchestratorProfile.OrchestratorRelease = "1.10" + p.OrchestratorProfile.OrchestratorRelease = "1.11" if err := p.Validate(false); err == nil { t.Errorf( "should error on invalid Windows version", diff --git a/scripts/build-windows-k8s.sh b/scripts/build-windows-k8s.sh index 1eb2bcce1b..55fa0c3607 100755 --- a/scripts/build-windows-k8s.sh +++ b/scripts/build-windows-k8s.sh @@ -224,6 +224,8 @@ apply_acs_cherry_picks() { k8s_18_cherry_pick elif [ "${KUBERNETES_RELEASE}" == "1.9" ]; then echo "No need to cherry-pick for 1.9!" + elif [ "${KUBERNETES_RELEASE}" == "1.10" ]; then + echo "No need to cherry-pick for 1.10!" else echo "Unable to apply cherry picks for ${KUBERNETES_RELEASE}." exit 1