Skip to content

Commit

Permalink
Allow concurrent runs of kubeadm e2e job.
Browse files Browse the repository at this point in the history
Since resources are named using this cluster name, include the
BUILD_NUMBER so it should differ between multiple concurrent runs in the
same project.

Also, adjust bootstrap_test.py to allow the word "resource" to be used.
  • Loading branch information
pipejakob committed Mar 15, 2017
1 parent b1f7fa1 commit 0866d08
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jenkins/bootstrap_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,7 @@ def testJobsDoNotSourceShell(self):
continue # No clean way to determine version
with open(job_path) as fp:
script = fp.read()
self.assertNotIn('source ', script, job)
self.assertFalse(re.search(r'\Wsource ', script), job)
self.assertNotIn('\n. ', script, job)

def testAllBashJobsHaveErrExit(self):
Expand Down
7 changes: 6 additions & 1 deletion jobs/ci-kubernetes-e2e-kubeadm-gce.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,18 @@ export KUBERNETES_PROVIDER=kubernetes-anywhere
# succeeded.
export SCM_VERSION=$(./hack/print-workspace-status.sh | grep ^STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)

export E2E_NAME="e2e-kubeadm-gce"
export E2E_NAME="e2e-kubeadm-${BUILD_NUMBER:-0}"
export E2E_OPT="--deployment kubernetes-anywhere --kubernetes-anywhere-path /workspace/kubernetes-anywhere"
export E2E_OPT+=" --kubernetes-anywhere-phase2-provider kubeadm --kubernetes-anywhere-cluster ${E2E_NAME}"
# The gs:// path given here should match jobs/ci-kubernetes-bazel-build.sh
export E2E_OPT+=" --kubernetes-anywhere-kubeadm-version gs://kubernetes-release-dev/bazel/${SCM_VERSION}/build/debs/"
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Conformance\]"

# Resource leak detection is disabled because prow runs multiple instances of
# this job in the same project concurrently, and resource leak detection will
# make the job flaky.
export FAIL_ON_GCP_RESOURCE_LEAK="false"

### post-env

# Assume we're upping, testing, and downing a cluster
Expand Down

0 comments on commit 0866d08

Please sign in to comment.