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.

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

Use dockerized e2e in PR Jenkins when special file exists #384

Merged
merged 1 commit into from
Aug 12, 2016

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Aug 11, 2016

It probably just works, but I'd like to test it first before I break the world. It'll use the existing method unless ./hack/jenkins/.use_dockerized_e2e exists.

After we verify that it works, we can remove this conditional.

A step towards fixing #318.

export PATH=${{PATH}}:/usr/local/go/bin
exit
fi
# Nothing should want Jenkins $HOME
Copy link
Member Author

Choose a reason for hiding this comment

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

GitHub is doing a poor job of illustrating this diff, but I just made the release-1.0/release-1.1 case exit so I could remove the "else" and all of its indentation.

@ixdy ixdy force-pushed the dockerized-e2e branch 2 times, most recently from acc2b72 to 4e883ab Compare August 12, 2016 20:38
@spxtr
Copy link
Contributor

spxtr commented Aug 12, 2016

I assume you're going to make a PR that touches that file and ensure it works?

@ixdy
Copy link
Member Author

ixdy commented Aug 12, 2016

Yes, that's the idea. :)

@spxtr spxtr added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 12, 2016
@@ -373,7 +373,11 @@
# Get golang into our PATH so we can run e2e.go
export PATH=${{PATH}}:/usr/local/go/bin

timeout -k 15m 55m ./hack/jenkins/e2e-runner.sh && rc=$? || rc=$?
if [[ -e "./hack/jenkins/.use_dockerized_e2e" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

Should it be -x ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not executing this file - just using it as a marker to trigger the dockerized code path.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, ok misread. Thought it was the same as the .sh below

@ixdy ixdy merged commit d36f1ef into kubernetes:master Aug 12, 2016
foxish pushed a commit to foxish/test-infra that referenced this pull request Jan 21, 2017
Add kubernetes-test-go to build blockers
grantr pushed a commit to grantr/test-infra that referenced this pull request Feb 21, 2020
* Ignore localhost links by default
* Allow per-repo custom config in /test

Bonus: make library tests less verbose, and its output clearer.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/jenkins lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants