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.

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

OCPBUGS-36904: aws: bump CAPA for subnet tagging fix #8730

Merged
merged 2 commits into from
Jul 23, 2024

Conversation

r4f4
Copy link
Contributor

@r4f4 r4f4 commented Jul 12, 2024

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 12, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jul 12, 2024
@openshift-ci-robot
Copy link
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-36904, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This bump includes the following fix:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jul 12, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 12, 2024

Marking as WIP until the upstream PR is accepted.

@openshift-ci openshift-ci bot requested review from patrickdillon and sadasu July 12, 2024 17:04
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 12, 2024

/uncc @patrickdillon @sadasu
Will cc back in when it's ready for review.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2024
@r4f4 r4f4 force-pushed the aws-subnet-tags-fix branch from 58aa927 to 6551aab Compare July 16, 2024 20:40
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 16, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 16, 2024

/retitle OCPBUGS-36904: aws: bump CAPA for subnet tagging fix

Upstream PR has merged, removing WIP.

@openshift-ci openshift-ci bot changed the title WIP: OCPBUGS-36904: aws: bump CAPA for subnet tagging fix OCPBUGS-36904: aws: bump CAPA for subnet tagging fix Jul 16, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 16, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 16, 2024
@openshift-ci-robot
Copy link
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-36904, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @gpei

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from gpei July 16, 2024 20:44
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 16, 2024

/cc @patrickdillon @sadasu
This is ready for review now.

@openshift-ci openshift-ci bot requested review from patrickdillon and sadasu July 16, 2024 20:44
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 16, 2024

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jul 16, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Jul 16, 2024

/label platform/aws

@r4f4
Copy link
Contributor Author

r4f4 commented Jul 17, 2024

/test altinfra-e2e-aws-ovn

@r4f4
Copy link
Contributor Author

r4f4 commented Jul 19, 2024

/retest-required

Copy link
Contributor

openshift-ci bot commented Jul 19, 2024

@r4f4: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-ovn-shared-vpc-edge-zones 6551aab link false /test e2e-aws-ovn-shared-vpc-edge-zones
ci/prow/e2e-external-aws-ccm 6551aab link false /test e2e-external-aws-ccm
ci/prow/e2e-aws-ovn-edge-zones 6551aab link false /test e2e-aws-ovn-edge-zones
ci/prow/e2e-aws-ovn-single-node 6551aab link false /test e2e-aws-ovn-single-node
ci/prow/e2e-aws-ovn-heterogeneous 6551aab link false /test e2e-aws-ovn-heterogeneous
ci/prow/e2e-aws-ovn-shared-vpc-custom-security-groups 6551aab link false /test e2e-aws-ovn-shared-vpc-custom-security-groups
ci/prow/e2e-aws-ovn-fips 6551aab link false /test e2e-aws-ovn-fips
ci/prow/e2e-aws-ovn-imdsv2 6551aab link false /test e2e-aws-ovn-imdsv2

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@sadasu
Copy link
Contributor

sadasu commented Jul 23, 2024

/approve

@sadasu
Copy link
Contributor

sadasu commented Jul 23, 2024

/retest-required

Copy link
Contributor

openshift-ci bot commented Jul 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sadasu

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2024
Copy link
Contributor

@barbacbd barbacbd left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 4bdd07d and 2 for PR HEAD 6551aab in total

@openshift-merge-bot openshift-merge-bot bot merged commit 2623fb6 into openshift:master Jul 23, 2024
20 of 28 checks passed
@openshift-ci-robot
Copy link
Contributor

@r4f4: Jira Issue OCPBUGS-36904: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-36904 has been moved to the MODIFIED state.

In response to this:

This bump includes the following fix:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-altinfra
This PR has been included in build ose-installer-altinfra-container-v4.18.0-202407240243.p0.g2623fb6.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.18.0-202407240243.p0.g2623fb6.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-terraform-providers
This PR has been included in build ose-installer-terraform-providers-container-v4.18.0-202407240243.p0.g2623fb6.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.18.0-202407240243.p0.g2623fb6.assembly.stream.el9.
All builds following this will include this PR.

@r4f4
Copy link
Contributor Author

r4f4 commented Jul 24, 2024

/cherry-pick release-4.16

@openshift-cherrypick-robot

@r4f4: #8730 failed to apply on top of branch "release-4.16":

Applying: OCPBUGS-36904: aws: bump CAPA for subnet tagging fix
Using index info to reconstruct a base tree...
M	cluster-api/providers/aws/go.mod
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging cluster-api/providers/aws/go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-36904: aws: bump CAPA for subnet tagging fix
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.16

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. platform/aws
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants