Skip to content

Fix Calico liveness and readiness checks to include Calico 3.2#10449

Merged
sdodson merged 1 commit intoopenshift:masterfrom
mgleung:calico-binary-checks-versions
Oct 25, 2018
Merged

Fix Calico liveness and readiness checks to include Calico 3.2#10449
sdodson merged 1 commit intoopenshift:masterfrom
mgleung:calico-binary-checks-versions

Conversation

@mgleung
Copy link
Contributor

@mgleung mgleung commented Oct 19, 2018

Fixes the regex for controlling what type of Calico liveness and readiness checks are used to include version 3.2.0.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 19, 2018
@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 19, 2018
@papr-bot
Copy link

papr-bot commented Oct 19, 2018

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

@vrutkovs
Copy link
Contributor

vrutkovs commented Oct 19, 2018

/ok-to-test
/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 19, 2018
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 19, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgleung, vrutkovs

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

The pull request process is described here

Details 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 Oct 19, 2018
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 19, 2018

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 20, 2018

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 21, 2018

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 22, 2018

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 23, 2018

/retest

Please review the full test history for this PR and help us cut down flakes.

@vrutkovs
Copy link
Contributor

vrutkovs commented Oct 23, 2018

/refresh

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 24, 2018

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 25, 2018

@mgleung: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-gcp 43f8147 link /test e2e-gcp

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.

Details

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.

@sdodson sdodson merged commit 143d090 into openshift:master Oct 25, 2018
@vrutkovs
Copy link
Contributor

vrutkovs commented Oct 25, 2018

/cherrypick release-3.11

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 25, 2018
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 25, 2018

@vrutkovs: new pull request created: #10517

Details

In response to this:

/cherrypick release-3.11

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.

@mgleung
Copy link
Contributor Author

mgleung commented Nov 6, 2018

@vrutkovs can we get this cherry-picked into release-3.10 and release-3.9 as well?

@vrutkovs
Copy link
Contributor

vrutkovs commented Nov 7, 2018

/cherrypick release-3.10

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 7, 2018

@vrutkovs: #10449 failed to apply on top of branch "release-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	roles/calico/tasks/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/calico/tasks/main.yml
CONFLICT (content): Merge conflict in roles/calico/tasks/main.yml
Patch failed at 0001 Fix Calico liveness and readiness checks to include Calico 3.2
Details

In response to this:

/cherrypick release-3.10

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.

@vrutkovs
Copy link
Contributor

vrutkovs commented Nov 7, 2018

/cherrypick release-3.9

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 7, 2018

@vrutkovs: #10449 failed to apply on top of branch "release-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	roles/calico/tasks/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/calico/tasks/main.yml
CONFLICT (content): Merge conflict in roles/calico/tasks/main.yml
Patch failed at 0001 Fix Calico liveness and readiness checks to include Calico 3.2
Details

In response to this:

/cherrypick release-3.9

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.

@vrutkovs
Copy link
Contributor

vrutkovs commented Nov 7, 2018

@mgleung not sure why it wouldn't cherrypick cleanly, maybe some other fixes should be merged first?

@mgleung
Copy link
Contributor Author

mgleung commented Nov 7, 2018 •
edited
Loading

@vrutkovs I think it might be because the cherry-pick for #10018 in the release-3.9 branch didn't look like it got picked up by the bot?

@vrutkovs
Copy link
Contributor

vrutkovs commented Nov 10, 2018

Ah, right. Created #10666

@mgleung mgleung mentioned this pull request Nov 28, 2018
Merged
@mgleung
Copy link
Contributor Author

mgleung commented Nov 29, 2018

@vrutkovs now that #10666 has been merged, can we get this cherry-picked to the release-3.9 branch?

@mgleung mgleung deleted the calico-binary-checks-versions branch December 5, 2018 22:42
@mgleung mgleung mentioned this pull request Dec 5, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mtnbikenc mtnbikenc Awaiting requested review from mtnbikenc

@vrutkovs vrutkovs Awaiting requested review from vrutkovs

Assignees

@vrutkovs vrutkovs

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@mgleung @papr-bot @vrutkovs @openshift-ci-robot @openshift-merge-robot @openshift-cherrypick-robot @sdodson