diff --git a/.circleci/config.yml b/.circleci/config.yml index 622a3e5c8..77a23304c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -444,6 +444,38 @@ jobs: path: /go/src/github.com/Azure/acs-engine/_logs - store_artifacts: path: /go/src/github.com/Azure/acs-engine/_output + openshift-3.9-centos-e2e: + working_directory: /go/src/github.com/Azure/acs-engine + docker: + - image: registry.svc.ci.openshift.org/ci/acs-engine-tests:v3.9 + environment: + GOPATH: /go + steps: + - checkout + - run: | + echo 'export TIMEOUT=30m' >> $BASH_ENV + echo 'export DISTRO=openshift39_centos' >> $BASH_ENV + echo 'export LOCATION=eastus' >> $BASH_ENV + echo 'export ORCHESTRATOR_RELEASE=3.9' >> $BASH_ENV + echo 'export ORCHESTRATOR_VERSION=3.9.0' >> $BASH_ENV + echo 'export CLUSTER_DEFINITION=examples/openshift.json' >> $BASH_ENV + echo 'export CREATE_VNET=false' >> $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 openshift e2e tests + command: make test-openshift + 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: @@ -537,6 +569,12 @@ workflows: filters: branches: ignore: master + - openshift-3.9-centos-e2e: + requires: + - pr-e2e-hold + filters: + branches: + ignore: master - swarm-e2e: requires: - pr-e2e-hold @@ -633,6 +671,12 @@ workflows: filters: branches: only: master + - openshift-3.9-centos-e2e: + requires: + - test + filters: + branches: + only: master - dcos-e2e: requires: - test