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

Rebase 1.18.2 #24936

Merged
merged 8 commits into from May 11, 2020
Merged

Rebase 1.18.2 #24936

merged 8 commits into from May 11, 2020

Conversation

marun
Copy link
Contributor

@marun marun commented Apr 30, 2020

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. vendor-update Touching vendor dir or related files labels Apr 30, 2020
@marun marun force-pushed the origin-4.5-kubernetes-1.18.2 branch from 87e6cdd to 82de696 Compare April 30, 2020 06:55
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 30, 2020
@marun marun force-pushed the origin-4.5-kubernetes-1.18.2 branch from 82de696 to 5a68612 Compare April 30, 2020 06:56
p0lyn0mial
p0lyn0mial reviewed Apr 30, 2020
View reviewed changes
glide.yaml
@@ -187,7 +186,7 @@ import:

# required by opencontainers
- package: github.com/sirupsen/logrus
version: 839c75faf7f98a33d445d181f3018b5c3409a45e
version: v1.4.2
Copy link
Contributor

Choose a reason for hiding this comment

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

okay - it is on the same level

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, just updating to what kube was using.

@marun
Copy link
Contributor Author

marun commented Apr 30, 2020

/retest

1 similar comment
@marun
Copy link
Contributor Author

marun commented May 3, 2020

/retest

@p0lyn0mial
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 4, 2020
@marun
Copy link
Contributor Author

marun commented May 4, 2020

/retest

@marun
Copy link
Contributor Author

marun commented May 4, 2020

/hold

upgrade testing blocked by https://bugzilla.redhat.com/show_bug.cgi?id=1830809

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 4, 2020
@tnozicka
Copy link
Contributor

tnozicka commented May 5, 2020

as this is blocked we are going ahead with #24942
pls pick it in openshift/kubernetes#125 for the rebase

@marun marun force-pushed the origin-4.5-kubernetes-1.18.2 branch from 2dbd793 to d96d033 Compare May 9, 2020 02:19
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label May 9, 2020
@marun
Copy link
Contributor Author

marun commented May 9, 2020

/test e2e-aws-fips

@marun marun mentioned this pull request May 9, 2020
Merged
@marun marun force-pushed the origin-4.5-kubernetes-1.18.2 branch from d96d033 to 8582e2c Compare May 9, 2020 21:21
@p0lyn0mial
Copy link
Contributor

@marun will you move the missing carries after this merges?

@p0lyn0mial
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2020
@sttts
Copy link
Contributor

sttts commented May 11, 2020

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marun, p0lyn0mial, sttts

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:

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

1 similar comment
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marun, p0lyn0mial, sttts

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2020
@sttts
Copy link
Contributor

sttts commented May 11, 2020

/override verify

@p0lyn0mial
Copy link
Contributor

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 11, 2020
@mfojtik
Copy link
Member

mfojtik commented May 11, 2020

/override verify

@openshift-ci-robot
Copy link

@mfojtik: /override requires a failed status context to operate on.
The following unknown contexts were given:

  • verify

Only the following contexts were expected:

  • ci/prow/artifacts
  • ci/prow/e2e-aws-fips
  • ci/prow/e2e-aws-serial
  • ci/prow/e2e-cmd
  • ci/prow/e2e-gcp
  • ci/prow/e2e-gcp-upgrade
  • ci/prow/images
  • ci/prow/unit
  • ci/prow/verify
  • tide

In response to this:

/override verify

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.

@mfojtik
Copy link
Member

mfojtik commented May 11, 2020

/override ci/prow/verify

@openshift-ci-robot
Copy link

@mfojtik: Overrode contexts on behalf of mfojtik: ci/prow/verify

In response to this:

/override ci/prow/verify

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.

@openshift-ci-robot
Copy link

@sttts: /override requires a failed status context to operate on.
The following unknown contexts were given:

  • verify

Only the following contexts were expected:

  • ci/prow/artifacts
  • ci/prow/e2e-aws-fips
  • ci/prow/e2e-aws-serial
  • ci/prow/e2e-cmd
  • ci/prow/e2e-gcp
  • ci/prow/e2e-gcp-upgrade
  • ci/prow/images
  • ci/prow/unit
  • ci/prow/verify
  • tide

In response to this:

/override verify

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.

@mfojtik mfojtik added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 11, 2020
@openshift-merge-robot openshift-merge-robot merged commit d6084de into openshift:master May 11, 2020
@damemi damemi mentioned this pull request May 11, 2020
Merged
@marun marun mentioned this pull request May 19, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p0lyn0mial p0lyn0mial p0lyn0mial left review comments

@sttts sttts Awaiting requested review from sttts

Assignees

@p0lyn0mial p0lyn0mial

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@marun @p0lyn0mial @tnozicka @sttts @openshift-ci-robot @mfojtik @openshift-merge-robot