Skip to content

USHIFT-1235: Fix RHEL 9.2 DVD name following the operating system GA#1785

Merged
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
ggiguash:dvd_name_fix
May 11, 2023
Merged

USHIFT-1235: Fix RHEL 9.2 DVD name following the operating system GA#1785
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
ggiguash:dvd_name_fix

Conversation

@ggiguash
Copy link
Contributor

@ggiguash ggiguash commented May 10, 2023

Follow-up on #1770
Closes USHIFT-1235

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 10, 2023

@ggiguash: This pull request references USHIFT-1235 which is a valid jira issue.

Details

In response to this:

Follow-up on #1770
Closes USHIFT-1235

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 10, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 10, 2023

@ggiguash: This pull request references USHIFT-1235 which is a valid jira issue.

Details

In response to this:

Follow-up on #1770
Closes USHIFT-1235

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 openshift-ci bot requested review from pliurh and pmtk May 10, 2023 15:09
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2023
@dhellmann
Copy link
Contributor

The updated script worked for me on x86.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, ggiguash

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

/retest-required

Remaining retests: 0 against base HEAD 21d4fa9 and 2 for PR HEAD 1e26aab in total

@ggiguash
Copy link
Contributor Author

/test ci/prow/e2e-openshift-conformance-reduced

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

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

  • /test e2e-openshift-conformance-reduced
  • /test images
  • /test test-srpm
  • /test test-unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-openshift-conformance-reduced-arm
  • /test microshift-e2e
  • /test microshift-e2e-arm

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-microshift-main-e2e-openshift-conformance-reduced
  • pull-ci-openshift-microshift-main-e2e-openshift-conformance-reduced-arm
  • pull-ci-openshift-microshift-main-images
  • pull-ci-openshift-microshift-main-microshift-e2e
  • pull-ci-openshift-microshift-main-microshift-e2e-arm
  • pull-ci-openshift-microshift-main-test-unit
  • pull-ci-openshift-microshift-main-verify
Details

In response to this:

/test ci/prow/e2e-openshift-conformance-reduced

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.

@ggiguash
Copy link
Contributor Author

/test e2e-openshift-conformance-reduced

@ggiguash
Copy link
Contributor Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

@ggiguash: 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-openshift-conformance-reduced-arm 1e26aab link false /test e2e-openshift-conformance-reduced-arm
ci/prow/microshift-e2e 1e26aab link false /test microshift-e2e
ci/prow/microshift-e2e-arm 1e26aab link false /test microshift-e2e-arm

Full PR test history. Your PR dashboard.

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.

@openshift-merge-robot openshift-merge-robot merged commit 987fffb into openshift:main May 11, 2023
@ggiguash ggiguash deleted the dvd_name_fix branch May 11, 2023 10:12
@ggiguash
Copy link
Contributor Author

/cherrypick release-4.13

@openshift-cherrypick-robot

@ggiguash: #1785 failed to apply on top of branch "release-4.13":

Applying: Fix RHEL 9.2 DVD name following the operating system GA
Using index info to reconstruct a base tree...
A	ansible/roles/create-vm/defaults/main.yml
M	docs/devenv_cloud.md
M	docs/devenv_setup.md
M	docs/devenv_setup_auto.md
M	scripts/devenv-builder/manage-vm.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/devenv-builder/manage-vm.sh
CONFLICT (content): Merge conflict in scripts/devenv-builder/manage-vm.sh
Auto-merging docs/devenv_setup_auto.md
CONFLICT (content): Merge conflict in docs/devenv_setup_auto.md
Auto-merging docs/devenv_setup.md
CONFLICT (content): Merge conflict in docs/devenv_setup.md
Auto-merging docs/devenv_cloud.md
CONFLICT (content): Merge conflict in docs/devenv_cloud.md
CONFLICT (modify/delete): ansible/roles/create-vm/defaults/main.yml deleted in HEAD and modified in Fix RHEL 9.2 DVD name following the operating system GA. Version Fix RHEL 9.2 DVD name following the operating system GA of ansible/roles/create-vm/defaults/main.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix RHEL 9.2 DVD name following the operating system GA
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".

Details

In response to this:

/cherrypick 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. 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.

5 participants