From 1c28cf016c6379ad742b2b9991740e3efb30851d Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 8 Apr 2016 08:28:18 -0700 Subject: [PATCH] Fix upgrade tests --- hack/jenkins/e2e-runner.sh | 2 +- .../job-configs/kubernetes-jenkins/kubernetes-e2e.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh index 04f52780be0..85698cf44ba 100755 --- a/hack/jenkins/e2e-runner.sh +++ b/hack/jenkins/e2e-runner.sh @@ -290,7 +290,7 @@ if [[ -n "${JENKINS_PUBLISHED_TEST_VERSION:-}" ]]; then fetch_published_version_tars "${JENKINS_PUBLISHED_TEST_VERSION}" cd kubernetes # Upgrade the cluster before running other tests - if [[ "${E2E_UPGRADE_TEST,,}" == "true" ]]; then + if [[ "${E2E_UPGRADE_TEST:-}" == "true" ]]; then # Add a report prefix for the e2e tests so that the tests don't get overwritten when we run # the rest of the e2es. E2E_REPORT_PREFIX='upgrade' e2e_test "${GINKGO_UPGRADE_TEST_ARGS:-}" diff --git a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml index e76ccb1509a..ee72fcc6634 100644 --- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml @@ -870,6 +870,7 @@ export JENKINS_PUBLISHED_TEST_VERSION="ci/latest-1.2" export GINKGO_TEST_ARGS="--ginkgo.focus=Kubectl" export GINKGO_PARALLEL="y" + export E2E_OPT="--check_version_skew=false" - 'gke-upgrade-master-1.1-1.2': description: 'Deploys a cluster at v1.1, upgrades its master to v1.2, and runs v1.1 tests against it.' timeout: 30 @@ -880,6 +881,7 @@ export E2E_UPGRADE_TEST="true" export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest-1.2" export JENKINS_USE_OLD_TESTS="true" + export E2E_OPT="--check_version_skew=false" - 'gke-upgrade-cluster-1.1-1.2': description: 'Deploys a cluster at v1.1, upgrades the cluster to v1.2, and runs v1.1 tests against it.' timeout: 30 @@ -890,6 +892,7 @@ export E2E_UPGRADE_TEST="true" export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.2" export JENKINS_USE_OLD_TESTS="true" + export E2E_OPT="--check_version_skew=false" - 'gke-upgrade-cluster-new-1.1-1.2': description: 'Deploys a cluster at v1.1, upgrades the cluster to v1.2, and runs v1.2 tests against it.' timeout: 30 @@ -899,5 +902,6 @@ export JENKINS_PUBLISHED_TEST_VERSION="ci/latest-1.2" export E2E_UPGRADE_TEST="true" export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.2" + export E2E_OPT="--check_version_skew=false" jobs: - 'kubernetes-e2e-{suffix}'