Skip to content

USHIFT-1243: Start using RHEL 9.2 repositories for devenv and image builder#1789

Merged
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
ggiguash:switch_to_rhel92_ga
May 13, 2023
Merged

USHIFT-1243: Start using RHEL 9.2 repositories for devenv and image builder#1789
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
ggiguash:switch_to_rhel92_ga

Conversation

@ggiguash
Copy link
Contributor

@ggiguash ggiguash commented May 11, 2023

Closes USHIFT-1243

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 11, 2023

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

Details

In response to this:

Closes USHIFT-1243

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 11, 2023
@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 May 11, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 11, 2023

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

Details

In response to this:

Closes USHIFT-1243

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

openshift-ci bot commented May 11, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2023
@ggiguash ggiguash force-pushed the switch_to_rhel92_ga branch from 7f3359e to 3e7741f Compare May 11, 2023 14:08
@ggiguash ggiguash marked this pull request as ready for review May 11, 2023 14:24
@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 May 11, 2023
@openshift-ci openshift-ci bot requested review from dhellmann and pacevedom May 11, 2023 14:28
@ggiguash ggiguash force-pushed the switch_to_rhel92_ga branch from 3e7741f to 5a0f0a5 Compare May 11, 2023 16:43
@dhellmann
Copy link
Contributor

/lgtm

@dhellmann
Copy link
Contributor

/cherry-pick release-4.13

@openshift-cherrypick-robot

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

Details

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.

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

openshift-ci bot commented May 13, 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 1d49925 and 2 for PR HEAD 5a0f0a5 in total

@pmtk
Copy link
Member

pmtk commented May 13, 2023

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

@dhellmann
Copy link
Contributor

/test images

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 13, 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 5a0f0a5 link false /test e2e-openshift-conformance-reduced-arm
ci/prow/microshift-e2e-arm 5a0f0a5 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 7e6c090 into openshift:main May 13, 2023
@openshift-cherrypick-robot

@dhellmann: #1789 failed to apply on top of branch "release-4.13":

Applying: Start using RHEL 9.2 repositories for devenv and image builder
Using index info to reconstruct a base tree...
M	docs/devenv_setup.md
M	docs/rhel4edge_iso.md
M	hack/osbuild2copr.sh
M	scripts/devenv-builder/configure-vm.sh
M	scripts/image-builder/build.sh
M	scripts/image-builder/configure.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/image-builder/configure.sh
CONFLICT (content): Merge conflict in scripts/image-builder/configure.sh
Auto-merging scripts/image-builder/build.sh
CONFLICT (content): Merge conflict in scripts/image-builder/build.sh
Auto-merging scripts/devenv-builder/configure-vm.sh
CONFLICT (modify/delete): hack/osbuild2copr.sh deleted in Start using RHEL 9.2 repositories for devenv and image builder and modified in HEAD. Version HEAD of hack/osbuild2copr.sh left in tree.
Auto-merging docs/rhel4edge_iso.md
Auto-merging docs/devenv_setup.md
CONFLICT (content): Merge conflict in docs/devenv_setup.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Start using RHEL 9.2 repositories for devenv and image builder
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:

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

6 participants