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

jenkins: Get the image project for Trusty dynamically #20843

Merged
merged 1 commit into from
Feb 9, 2016
Merged

jenkins: Get the image project for Trusty dynamically #20843

merged 1 commit into from
Feb 9, 2016

Conversation

wonderfly
Copy link
Contributor

@wonderfly
Copy link
Contributor Author

@Amey-D

@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 8, 2016
@k8s-bot
Copy link

k8s-bot commented Feb 8, 2016

GCE e2e test build/test passed for commit ec4d1f87563a4641a8301714083a8e05455fe3d2.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

@Amey-D
Copy link
Contributor

Amey-D commented Feb 8, 2016

LGTM

@spxtr
Copy link
Contributor

spxtr commented Feb 8, 2016

Do we need to get this for every build, or can it be just done for trusty builds?

Also, does this need to be exported?

@wonderfly
Copy link
Contributor Author

Do we need to get this for every build, or can it be just done for trusty builds?

It's the same for all builds.

Also, does this need to be exported?

What exactly do you mean by exported?

spxtr
spxtr reviewed Feb 8, 2016
View reviewed changes
hack/jenkins/e2e.sh
rm -rf .config &> /dev/null
rm -rf .gsutil &> /dev/null
}
TRUSTY_IMAGE_PROJECT="$(get_trusty_image_project)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this be wrapped in a if [[ "${JOB_NAME}" =~ -trusty- ]]; then ... fi block so that we don't need to run it for all the other jobs on this branch? Not a big deal, though.

Copy link
Contributor

Choose a reason for hiding this comment

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

I was wondering if this needs to be export TRUSTY_IMAGE_PROJECT=..., but I don't think it does. That variable isn't used in any other files, is it?

@wonderfly
Copy link
Contributor Author

Can this be wrapped in a if [[ "${JOB_NAME}" =~ -trusty- ]]; then ... fi block so that we don't need to run it for all the other jobs on this branch? Not a big deal, though.

Great idea. Done.

I was wondering if this needs to be export TRUSTY_IMAGE_PROJECT=..., but I don't think it does. That variable isn't used in any other files, is it?

It's not used outside of this script.

@spxtr
Copy link
Contributor

spxtr commented Feb 8, 2016

LGTM

@k8s-bot
Copy link

k8s-bot commented Feb 9, 2016

GCE e2e test build/test passed for commit 7062a4c1de8d9e2c856fbedd31634abf336b491f.

@k8s-bot
Copy link

k8s-bot commented Feb 9, 2016

GCE e2e test build/test passed for commit 25aa5210740626e98dccf03685627085074e87fd.

@k8s-github-robot
Copy link

PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2016
@wonderfly
Copy link
Contributor Author

Rebased. PTAL.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2016
@spxtr spxtr assigned spxtr and unassigned ikehz Feb 9, 2016
@spxtr
Copy link
Contributor

spxtr commented Feb 9, 2016

LGTM

@spxtr spxtr added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge and removed needs-ok-to-merge labels Feb 9, 2016
@k8s-bot
Copy link

k8s-bot commented Feb 9, 2016

GCE e2e test build/test passed for commit b8dee75.

@wonderfly wonderfly mentioned this pull request Feb 9, 2016
Merged
@spxtr
Copy link
Contributor

spxtr commented Feb 9, 2016

@k8s-oncall mind manually merging?

@krousey
Copy link
Contributor

krousey commented Feb 9, 2016

@spxtr Can it wait on the merge queue? It's currently blocked because the scale test timed out in bringing up the cluster. It's re-running right now and already got past the set up point.

@wonderfly
Copy link
Contributor Author

It's re-running right now and already got past the set up point.

We can wait if it's going to be finished soon.

@krousey
Copy link
Contributor

krousey commented Feb 9, 2016

Merging because it's test infra and been bumped a couple of times.

krousey added a commit that referenced this pull request Feb 9, 2016
@krousey
Merge pull request #20843 from wonderfly/update_trusty_image_project
d7d5d7c 
jenkins: Get the image project for Trusty dynamically
@krousey krousey merged commit d7d5d7c into kubernetes:release-1.1 Feb 9, 2016
@wonderfly
Copy link
Contributor Author

Thanks

@wonderfly wonderfly deleted the update_trusty_image_project branch March 18, 2016 17:58
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@krousey
Merge pull request kubernetes#20843 from wonderfly/update_trusty_imag…
35b7694 
…e_project

jenkins: Get the image project for Trusty dynamically
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@krousey
Merge pull request kubernetes#20843 from wonderfly/update_trusty_imag…
27ac4ae 
…e_project

jenkins: Get the image project for Trusty dynamically
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@spxtr spxtr

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

Successfully merging this pull request may close these issues.

None yet
9 participants
@wonderfly @k8s-github-robot @k8s-bot @Amey-D @spxtr @krousey @k8s-teamcity-mesosphere @ikehz @googlebot