Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow concurrent runs of kubeadm e2e job. #2265

Merged
merged 1 commit into from
Mar 15, 2017
+7 −2
Merged

Allow concurrent runs of kubeadm e2e job. #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jenkins/bootstrap_test.py
View file
Open in desktop
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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This no longer works:

re.search(r'\Wsource', 'source foo.sh')

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, there's going to be a '\n' before, nice!

self.assertNotIn('\n. ', script, job)

def testAllBashJobsHaveErrExit(self):
Expand Down
7 changes: 6 additions & 1 deletion jobs/ci-kubernetes-e2e-kubeadm-gce.sh
View file
Open in desktop
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