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

refactor bootstrap image, bump images #8874

Merged
merged 4 commits into from
Jul 31, 2018

Conversation

BenTheElder
Copy link
Member

  • use COPY instead of ADD... ADD is more magical
  • copy create_bazel_cache_rcs.sh into the image
  • split the entrypoint into a runner for dind + bazel caching, and the actual bootstrap entrypoint
    • xref: figure out DinD + podutils #8780, this will let podutils jobs work like: /usr/local/bin/runner.sh my-test-command with env DOCKER_IN_DOCKER_ENABLED. still sorta gross, but it should help us move forward for now. I may refactor further at some point.
  • make the new runner use the baked in create_bazel_cache_rcs.sh when we don't have a test-infra checkout (so bazel caching should also work in podutils jobs now)

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 28, 2018
@BenTheElder
Copy link
Member Author

BenTheElder commented Jul 28, 2018

/area images
/assign @krzyzacy
I've verified that this at least builds but I haven't tested it at all yet. It should be fine, but we should definitely keep an eye out next time we bump :-)
/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 28, 2018
@krzyzacy
Copy link
Member

I guess push and attach a build log from some job that uses the latest image?

@BenTheElder
Copy link
Member Author

BenTheElder commented Jul 30, 2018 via email

@BenTheElder
Copy link
Member Author

going to rebase onto #8883 and just make this a bump PR as well

@BenTheElder BenTheElder force-pushed the refactor-bootstrap-runner branch from c458d1d to f0e0e9a Compare July 30, 2018 17:59
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 30, 2018
@BenTheElder BenTheElder changed the title refactor bootstrap image refactor bootstrap image, bump images Jul 30, 2018

ENTRYPOINT ["/workspace/runner"]
ENTRYPOINT ["/user/bin/entrypoint.sh"]
Copy link
Member Author

Choose a reason for hiding this comment

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

grrr this should be /usr/bin/entrypoint.sh

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

if [[ -d "./test-infra" ]]; then
./test-infra/images/bootstrap/create_bazel_cache_rcs.sh
else
/usr/local/bin/create_bazel_cache_rcs.sh | bash
Copy link
Member

Choose a reason for hiding this comment

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

we have to pipe the output into bash? (we don't do this on line 28)

Copy link
Member Author

Choose a reason for hiding this comment

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

oops, yeah, I initially thought about curl | bash the latest from test-infra but felt terrible about that and did this instead. forgot to drop the pipe to bash 🤦‍♂️

thanks!

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

./test-infra/jenkins/bootstrap.py \
--job="${JOB_NAME}" \
--service-account="${GOOGLE_APPLICATION_CREDENTIALS}" \
--upload='gs://kubernetes-jenkins/logs' \
Copy link
Member

Choose a reason for hiding this comment

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

should this be configurable? (i remember some jobs have pr-logs or something)

Copy link
Member Author

@BenTheElder BenTheElder Jul 30, 2018

Choose a reason for hiding this comment

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

you can specify it again and overwrite it IIRC. I didn't want to touch these flags as this is how they were in the image now. ideally we will phase out using ENTRYPOINT for this and just have some jobs use the runner script + podutils

Copy link
Member

Choose a reason for hiding this comment

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

👍

@BenTheElder BenTheElder force-pushed the refactor-bootstrap-runner branch from f0e0e9a to c1d092c Compare July 30, 2018 20:36
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 30, 2018
@BenTheElder BenTheElder force-pushed the refactor-bootstrap-runner branch from 4902db2 to c3257f6 Compare July 30, 2018 21:01
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 30, 2018
@BenTheElder BenTheElder force-pushed the refactor-bootstrap-runner branch from c3257f6 to eae9bec Compare July 30, 2018 21:25
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 30, 2018
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 30, 2018
@BenTheElder
Copy link
Member Author

rebased, fixed the paths, re-bumped

@BenTheElder
Copy link
Member Author

https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-canary/19553/?log#log
passed with:

Image: gcr.io/k8s-testimages/kubekins-e2e:v20180730-8b7ab3104-master

@krzyzacy
Copy link
Member

/lgtm
/hold

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 31, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, krzyzacy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [BenTheElder,krzyzacy]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@BenTheElder
Copy link
Member Author

/hold cancel
👀
FYI @cjwagner

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2018
@BenTheElder
Copy link
Member Author

FYI @neolit123 this is going out now. 🤞

@k8s-ci-robot k8s-ci-robot merged commit 7a1f0fc into kubernetes:master Jul 31, 2018
@BenTheElder
Copy link
Member Author

uh updateconfig did not run? @krzyzacy @cjwagner

@krzyzacy
Copy link
Member

hummmmmm

@krzyzacy
Copy link
Member

missed a hook ?! I cannot find any related logs

I'll work on #8892 now
/shrug

@k8s-ci-robot k8s-ci-robot added the ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯ label Jul 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/images cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants