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

[release-4.15] OCPBUGS-31036: UPSTREAM: 4670:Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called #501

Merged

Conversation

Patryk-Stefanski
Copy link

Carrying 4670

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 19, 2024
@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-31036, which is invalid:

  • expected the bug to target either version "4.16." or "openshift-4.16.", but it targets "4.15" instead

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:

Carrying 4670

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.

@Patryk-Stefanski Patryk-Stefanski changed the base branch from master to release-4.15 March 19, 2024 09:13
@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-31036, which is invalid:

  • expected Jira Issue OCPBUGS-31036 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

In response to this:

Carrying 4670

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.

@Patryk-Stefanski
Copy link
Author

/jira refresh

@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-31036, which is invalid:

  • expected Jira Issue OCPBUGS-31036 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

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 review from damdo and racheljpg March 19, 2024 09:13
…ly after ec2:RunInstances is called

This mitigates issues caused by falling back to tag-based searching for
EC2 instances in case future AWS calls fail, such as attaching ENIs to
security groups or tagging ENIs.

Signed-off-by: Michael Shen <mishen@umich.edu>
@Patryk-Stefanski
Copy link
Author

/test ci/prow/unit

Copy link

openshift-ci bot commented Mar 19, 2024

@Patryk-Stefanski: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-aws-ovn
  • /test e2e-aws-serial
  • /test e2e-hypershift
  • /test images
  • /test unit

The following commands are available to trigger optional jobs:

  • /test e2e-aws-capi-techpreview
  • /test e2e-aws-ovn-techpreview
  • /test verify-commits

Use /test all to run all jobs.

In response to this:

/test ci/prow/unit

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.

@Patryk-Stefanski
Copy link
Author

/test unit

@Patryk-Stefanski
Copy link
Author

/test e2e-aws-capi-techpreview

@damdo
Copy link
Member

damdo commented Mar 20, 2024

@Patryk-Stefanski that we failure is a known problem. I'll put up a patch to fix it

@damdo
Copy link
Member

damdo commented Mar 20, 2024

@Patryk-Stefanski this PR and its release-4.15 backport will need merging for e2e-aws-capi-techpreview to become green

@Patryk-Stefanski
Copy link
Author

@Patryk-Stefanski this PR and its release-4.15 backport will need merging for e2e-aws-capi-techpreview to become green

Ack, Will this also need to be backported to 4.14?

@damdo
Copy link
Member

damdo commented Mar 20, 2024

If you need to backport this PR also there, then yes

@Patryk-Stefanski
Copy link
Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@Patryk-Stefanski: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

@Patryk-Stefanski
Copy link
Author

/jira refresh

@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-31036, which is invalid:

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.

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.

@Patryk-Stefanski
Copy link
Author

/jira refresh

@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-31036, which is invalid:

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.

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.

@Patryk-Stefanski
Copy link
Author

/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 Mar 21, 2024
@openshift-ci-robot
Copy link

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-23174 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-23174 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

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.

@damdo
Copy link
Member

damdo commented Mar 22, 2024

/retitle [release-4.15] OCPBUGS-31036: UPSTREAM: 4670:Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called

@openshift-ci openshift-ci bot changed the title OCPBUGS-31036: UPSTREAM: 4670:Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called" [release-4.15] OCPBUGS-31036: UPSTREAM: 4670:Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called Mar 22, 2024
Copy link

openshift-ci bot commented Mar 22, 2024

@damdo: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-aws-ovn
  • /test e2e-aws-serial
  • /test e2e-hypershift
  • /test images
  • /test unit

The following commands are available to trigger optional jobs:

  • /test e2e-aws-capi-techpreview
  • /test e2e-aws-ovn-techpreview
  • /test verify-commits

Use /test all to run all jobs.

In response to this:

/test ci/prow/e2e-aws-capi-techpreview

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.

@damdo
Copy link
Member

damdo commented Mar 22, 2024

/test e2e-aws-capi-techpreview

@damdo
Copy link
Member

damdo commented Mar 22, 2024

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 22, 2024
@sunzhaohua2
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 22, 2024
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2024
Copy link

openshift-ci bot commented Mar 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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 Mar 22, 2024
@damdo
Copy link
Member

damdo commented Mar 22, 2024

/cherry-pick release-4.14

@openshift-cherrypick-robot

@damdo: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

Copy link

openshift-ci bot commented Mar 22, 2024

@Patryk-Stefanski: The following test 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-techpreview 8be85427fe1230faa9ff35359f55feee5fcae024 link false /test e2e-aws-ovn-techpreview

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

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0ba636c and 2 for PR HEAD da1f259 in total

@openshift-merge-bot openshift-merge-bot bot merged commit 17565ff into openshift:release-4.15 Mar 22, 2024
9 checks passed
@openshift-ci-robot
Copy link

@Patryk-Stefanski: Jira Issue OCPBUGS-31036: All pull requests linked via external trackers have merged:

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

In response to this:

Carrying 4670

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-cherrypick-robot

@Patryk-Stefanski: new pull request created: #506

In response to this:

/cherry-pick release-4.14

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-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-aws-cluster-api-controllers-container-v4.15.0-202403222344.p0.g17565ff.assembly.stream.el9 for distgit ose-aws-cluster-api-controllers.
All builds following this will include this PR.

@Patryk-Stefanski
Copy link
Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@Patryk-Stefanski: new pull request could not be created: failed to create pull request against openshift/cluster-api-provider-aws#release-4.14 from head openshift-cherrypick-robot:cherry-pick-501-to-release-4.14: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:release-4.14 and openshift-cherrypick-robot:cherry-pick-501-to-release-4.14"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

In response to this:

/cherry-pick release-4.14

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-cherrypick-robot

@Patryk-Stefanski: #501 failed to apply on top of branch "release-4.13":

Applying: UPSTREAM: 4670: Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called
Using index info to reconstruct a base tree...
M	pkg/cloud/services/ec2/instances.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloud/services/ec2/instances.go
CONFLICT (content): Merge conflict in pkg/cloud/services/ec2/instances.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: 4670: Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called
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.13

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants