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

Ensure user supplied labels override existing image labels during builds #16700

Merged
merged 2 commits into from
Oct 6, 2017
Merged

Ensure user supplied labels override existing image labels during builds #16700

merged 2 commits into from
Oct 6, 2017

Conversation

bparees
Copy link
Contributor

@bparees bparees commented Oct 5, 2017

No description provided.

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 5, 2017
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 5, 2017
@bparees
Copy link
Contributor Author

bparees commented Oct 5, 2017

@jim-minter ptal

@bparees
Copy link
Contributor Author

bparees commented Oct 5, 2017

@GrahamDumpleton fyi

@jim-minter
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 5, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jim-minter

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@bparees
Copy link
Contributor Author

bparees commented Oct 5, 2017

/retest

@bparees bparees added the kind/bug Categorizes issue or PR as related to a bug. label Oct 5, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 5, 2017
@bparees
Copy link
Contributor Author

bparees commented Oct 5, 2017

/retest

1 similar comment
@bparees
Copy link
Contributor Author

bparees commented Oct 5, 2017

/retest

@bparees bparees added the lgtm Indicates that a PR is ready to be merged. label Oct 5, 2017
@bparees
Copy link
Contributor Author

bparees commented Oct 5, 2017

/retest

1 similar comment
@bparees
Copy link
Contributor Author

bparees commented Oct 6, 2017

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 16700, 16696, 16698, 16661, 16704).

@openshift-merge-robot openshift-merge-robot merged commit 0681d49 into openshift:master Oct 6, 2017
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 6, 2017 •
edited
Loading

@bparees: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/origin/unit ab79a0c link /test origin-ut
ci/openshift-jenkins/origin/verify ab79a0c link /test origin-verify
ci/openshift-jenkins/extended_builds ab79a0c link /test extended_builds

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@bparees bparees deleted the s2i-df6fb76a-bump branch October 9, 2017 02:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@soltysh soltysh

@jim-minter jim-minter

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm 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.

None yet
6 participants
@bparees @jim-minter @openshift-merge-robot @openshift-ci-robot @soltysh @deads2k