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

bug 1546311. fix ocp image in downstream #964

Merged
merged 1 commit into from Feb 21, 2018
Merged

bug 1546311. fix ocp image in downstream #964

merged 1 commit into from Feb 21, 2018

Conversation

jcantrill
Copy link
Contributor

@jcantrill jcantrill commented Feb 20, 2018 •
edited

This PR updates Dockerfile to latest and adds ocp image

ref: https://bugzilla.redhat.com/show_bug.cgi?id=1546311

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 20, 2018
ewolinetz
ewolinetz reviewed Feb 20, 2018
View reviewed changes
kibana/Dockerfile
io.k8s.display-name="Kibana" \
version="v3.9.0" \
architecture="x86_64" \
release="0.46.0.0" \
Copy link
Contributor

Choose a reason for hiding this comment

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

this shouldn't be "1" as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All of this will be regenerated by cd tooling

@ewolinetz
Copy link
Contributor

Can you add the link to the bz in the description?

@ewolinetz
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2018
@richm
Copy link
Contributor

richm commented Feb 20, 2018

/test logging

1 similar comment
@richm
Copy link
Contributor

richm commented Feb 21, 2018

/test logging

This was referenced Feb 21, 2018
Merged
Merged
openshift-merge-robot added a commit that referenced this pull request Feb 21, 2018
@openshift-merge-robot
Merge pull request #966 from jcantrill/1547263
a054635 
Automatic merge from submit-queue.

fix ocp header image downstream

This is a 3.7 backport of #964 

ref: https://bugzilla.redhat.com/show_bug.cgi?id=1547263
@jcantrill
Copy link
Contributor Author

/test logging

@richm
Copy link
Contributor

richm commented Feb 21, 2018

/retest

2 similar comments
@richm
Copy link
Contributor

richm commented Feb 21, 2018

/retest

@jcantrill
Copy link
Contributor Author

/retest

openshift-merge-robot added a commit that referenced this pull request Feb 21, 2018
@openshift-merge-robot
Merge pull request #967 from jcantrill/1547347
b4a9067 
Automatic merge from submit-queue.

fix origin kibana image

3.6 backport of #964 
ref: https://bugzilla.redhat.com/show_bug.cgi?id=1547347
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

@jcantrill please be advised that I am in fact a robot.

Beep Boop.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit c2f42c6 into openshift:master Feb 21, 2018
@jcantrill jcantrill deleted the 1546311_fix_ocp_log branch February 21, 2018 20:25
@jcantrill
Copy link
Contributor Author

/cherrypick es5.x

@openshift-cherrypick-robot
Copy link

@jcantrill: #964 failed to apply on top of branch "es5.x":

.git/rebase-apply/patch:14: trailing whitespace.
#oit## 
.git/rebase-apply/patch:20: trailing whitespace.
#oit## 
.git/rebase-apply/patch:68: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	kibana/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging kibana/Dockerfile
CONFLICT (content): Merge conflict in kibana/Dockerfile
Patch failed at 0001 bug 1546311. fix ocp image in downstream

In response to this:

/cherrypick es5.x

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.

@jcantrill jcantrill mentioned this pull request Apr 25, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ewolinetz ewolinetz ewolinetz left review comments

Assignees

@ewolinetz ewolinetz

Labels
backport/completed backport/3.6 backport/3.7 lgtm Indicates that a PR is ready to be merged. release/3.9 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jcantrill @ewolinetz @richm @openshift-merge-robot @openshift-cherrypick-robot @openshift-ci-robot