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

Prep for upgrade job infra fixups #22073

Merged
merged 1 commit into from
Mar 1, 2016
Merged

Prep for upgrade job infra fixups #22073

merged 1 commit into from
Mar 1, 2016

Conversation

ikehz
Copy link
Contributor

@ikehz ikehz commented Feb 26, 2016

Right now, this is just work in preparation for making upgrade jobs easier to run in isolation, instead of having the 7-step mess.

I don't love how I structured JENKINS_USE_EXISTING_BINARIES and JENKINS_TOLERATE_DIRTY_WORKSPACE, but I couldn't figure out anything better. Feedback encouraged.

Plan:

For each X-Y version skew, run 4 suites:

  • Deploy at X and run Kubectl tests at Y
  • Deploy at X, upgrade master to Y, and run tests at X
  • Deploy at X, upgrade master and nodes to Y, and run tests at X
  • Deploy at X, upgrade master and nodes to Y, and run tests at Y

This should give us the same coverage as we have now, but without chaining runs together. I need this refactoring because I'll have to fetch and unpack different tests between cluster-up and test.

@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 Feb 26, 2016
@k8s-bot
Copy link

k8s-bot commented Feb 26, 2016

GCE e2e build/test failed for commit d2dec87c5bef501977c9a1c1fac4e3a5ee3dd82b.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

else
# .config and its children are created by the gcloud call that we use to
# get the GCE service account.
# console-log.txt is created by Jenkins, but is usually not flushed out
Copy link
Contributor

Choose a reason for hiding this comment

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

Either here or in the near future we should remove the console-log.txt exception, since I think @ixdy got rid of the trap call in upload-to-gcs.sh.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nevermind; I got scared and put it back.

@ikehz
Copy link
Contributor Author

ikehz commented Feb 26, 2016

@spxtr PTAL. I'm happy to continue pulling things into functions if you'd like; let me know. I think this is minimum of what I need to do to prep for upgrade tests, but there's plenty of other cleanup needed.

@k8s-bot
Copy link

k8s-bot commented Feb 26, 2016

GCE e2e build/test failed for commit c3772563f434ff90f9b24a0f3b6d971edc65977e.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@k8s-bot
Copy link

k8s-bot commented Feb 26, 2016

GCE e2e build/test passed for commit 9393b6e03ea3d3fa9cb10d7ef192a9ae3e267ea0.

@k8s-bot
Copy link

k8s-bot commented Feb 26, 2016

GCE e2e build/test passed for commit 8e1aedb9bb458a4e2a2b3b92bda5458764419147.

echo "Found KUBE_RUN_FROM_OUTPUT=y; will use binaries from _output"
cp _output/release-tars/kubernetes*.tar.gz .
function check_dirty_workspace() {
if [[ ! "${JENKINS_TOLERATE_DIRTY_WORKSPACE:-}" =~ ^[yY]$ ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems backwards?

@ikehz
Copy link
Contributor Author

ikehz commented Feb 27, 2016

@spxtr Yup, you're right; fixed. PTAL.

@ikehz ikehz changed the title [WIP] Upgrade job infra Prep for upgrade job infra fixups Feb 27, 2016
@ikehz
Copy link
Contributor Author

ikehz commented Feb 27, 2016

Progress toward #22104.

@k8s-bot
Copy link

k8s-bot commented Feb 27, 2016

GCE e2e build/test passed for commit 29506149e32b393694df3d4af585685cbeb33263.

@ikehz
Copy link
Contributor Author

ikehz commented Feb 29, 2016

Rebased to pick up fix for #22128.

@ikehz
Copy link
Contributor Author

ikehz commented Feb 29, 2016

@spxtr PTAL.

@k8s-bot
Copy link

k8s-bot commented Feb 29, 2016

GCE e2e build/test passed for commit c9132e775037c4b92b19bdec139d94f960327d4f.

@spxtr
Copy link
Contributor

spxtr commented Feb 29, 2016

LGTM, where the G stands for Great!

As usual, we might've missed something and this might break some Jenkins stuff. Probably squash and manual merge?

@ixdy you might be interested as well.

@ikehz
Copy link
Contributor Author

ikehz commented Mar 1, 2016

@spxtr squashed. Let's manually merge tomorrow morning.

@spxtr
Copy link
Contributor

spxtr commented Mar 1, 2016

SGTM

@k8s-bot
Copy link

k8s-bot commented Mar 1, 2016

GCE e2e build/test passed for commit adbd8a9.

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

ikehz commented Mar 1, 2016

Applying LGTM per above comments & merging manually to watch Jenkins. cc @k8s-oncall.

ikehz pushed a commit that referenced this pull request Mar 1, 2016
@ikehz ikehz merged commit 361cd2c into kubernetes:master Mar 1, 2016
@justinsb
Copy link
Member

justinsb commented Mar 1, 2016

@k8s-oncall @ihmccreery heads-up about breakage I observed (although I'm reusing this script in a way it shouldn't be used, so we'll see how Jenkins does)

@ikehz ikehz mentioned this pull request Mar 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/test area/test-infra area/upgrade 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
Development

Successfully merging this pull request may close these issues.

None yet

7 participants