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

Jump to bottom

Remove all non-release job definitions #17751

Merged
merged 1 commit into from
Dec 1, 2015
Merged

Remove all non-release job definitions #17751

merged 1 commit into from
Dec 1, 2015

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Nov 25, 2015

All non-master job definitions (with the exception to upgrade tests) are moving to the release branches in #17749 and #17750.

To reduce confusion, we'll delete these jobs from the master e2e.sh. Each job should be defined in only one place.

Note that more cleanup is intended long-term, but this is a short-term workaround to get things working well after #17180.

NOTE: do not merge this until #17749 and #17750 have been merged and all relevant jobs have been updated to point to the release branches.

cc @kubernetes/goog-testing @wonderfly @wojtek-t @piosz
x-ref #17734

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 25, 2015
@ixdy ixdy mentioned this pull request Nov 25, 2015
Closed
@ixdy ixdy force-pushed the jenkins-e2e-master branch 2 times, most recently from a2fed73 to 97653b7 Compare November 25, 2015 01:15
@ixdy ixdy mentioned this pull request Nov 25, 2015
Merged
@k8s-bot
Copy link

k8s-bot commented Nov 25, 2015

GCE e2e test build/test passed for commit ec91c7d8e90e088611bd25e5498ed87b25538185.

@k8s-bot
Copy link

k8s-bot commented Nov 25, 2015

GCE e2e test build/test passed for commit a2fed73abdb31bec69c1f18fa91dc58091ae90a6.

@k8s-bot
Copy link

k8s-bot commented Nov 25, 2015

GCE e2e test build/test passed for commit 97653b70dc3e07d5819dae87f7131d40e5d352f7.

@ixdy ixdy force-pushed the jenkins-e2e-master branch from 97653b7 to 5c3cc94 Compare November 25, 2015 02:06
@k8s-bot
Copy link

k8s-bot commented Nov 25, 2015

GCE e2e test build/test passed for commit 5c3cc94362a84eaa4cc204d096233bfbfe47f065.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2015
@ixdy ixdy force-pushed the jenkins-e2e-master branch from 5c3cc94 to 710189e Compare November 25, 2015 21:22
@ixdy
Copy link
Member Author

ixdy commented Nov 25, 2015

This should be safe to merge now. I've moved all relevant Jenkins jobs to use e2e.sh from release branches.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 25, 2015

GCE e2e build/test failed for commit 710189ed985fa36d0091db2c23ee8061dde34645.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 26, 2015
@ixdy ixdy force-pushed the jenkins-e2e-master branch from 710189e to ea4d6b1 Compare November 30, 2015 23:24
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2015
@ixdy
Copy link
Member Author

ixdy commented Nov 30, 2015

Rebased again. Should probably get this in so people don't think changes here will affect the 1.1 builds.

@k8s-bot
Copy link

k8s-bot commented Dec 1, 2015

GCE e2e test build/test passed for commit ea4d6b1.

@ikehz
Copy link
Contributor

ikehz commented Dec 1, 2015

LGTM. Sorry about the delay.

@ikehz ikehz added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 1, 2015
@ikehz
Copy link
Contributor

ikehz commented Dec 1, 2015

I vote for manual merge ASAP, if you're down.

@ixdy
Copy link
Member Author

ixdy commented Dec 1, 2015

Self-merging. I'll keep an eye on the builds, though I don't expect any issues.

ixdy added a commit that referenced this pull request Dec 1, 2015
@ixdy
Merge pull request #17751 from ixdy/jenkins-e2e-master
be856da 
Remove all non-release job definitions from hack/jenkins/e2e.sh
@ixdy ixdy merged commit be856da into kubernetes:master Dec 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ikehz ikehz

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ixdy @k8s-github-robot @k8s-bot @ikehz @k8s-teamcity-mesosphere @googlebot