Skip to content

Start using RHEL 9.2 in the devenv and edge#1584

Merged
dhellmann merged 2 commits intoopenshift:mainfrom
ggiguash:devenv_use_rhel92
Mar 30, 2023
Merged

Start using RHEL 9.2 in the devenv and edge#1584
dhellmann merged 2 commits intoopenshift:mainfrom
ggiguash:devenv_use_rhel92

Conversation

@ggiguash
Copy link
Contributor

@ggiguash ggiguash commented Mar 28, 2023

  • Switch the development environment to use RHEL 9.2 beta
  • Enable osbuild configuration to use RHEL 9.2 beta channels
  • Use golang that comes with the OS
  • Fix the golang dependency in the MicroShift RPM spec file

Closes:

@openshift-ci openshift-ci bot requested review from dhellmann and fzdarsky March 28, 2023 17:08
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2023
@ggiguash ggiguash force-pushed the devenv_use_rhel92 branch from f27f264 to 252e0e7 Compare March 28, 2023 17:18
@ggiguash
Copy link
Contributor Author

/retest

Copy link
Contributor

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

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

Tested in my dev environment.
/lgtm

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

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 29, 2023
@dhellmann
Copy link
Contributor

Are we confident about committing to a move to a beta version of the OS? I'd feel more comfortable making this optional so we can still develop easily on 9.1 if we have to.

@ggiguash
Copy link
Contributor Author

Are we confident about committing to a move to a beta version of the OS? I'd feel more comfortable making this optional so we can still develop easily on 9.1 if we have to.

I think we may want to try it and roll back in case there is a stopper issue. It's the OS used for OCP 4.13, so it should also be stable enough for MicroShift.

@ggiguash ggiguash force-pushed the devenv_use_rhel92 branch from 252e0e7 to ad0cb95 Compare March 29, 2023 13:53
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2023
@ggiguash
Copy link
Contributor Author

/cherrypick release-4.13

@openshift-cherrypick-robot

@ggiguash: 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:

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

@ggiguash
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 30, 2023
Copy link
Contributor

@dhellmann dhellmann 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 Mar 30, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [dhellmann,ggiguash,pacevedom]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dhellmann
Copy link
Contributor

The test just passed and then failed again.

/override ci/prow/e2e-reboot

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 30, 2023

@dhellmann: Overrode contexts on behalf of dhellmann: ci/prow/e2e-reboot

Details

In response to this:

The test just passed and then failed again.

/override ci/prow/e2e-reboot

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.

@dhellmann dhellmann merged commit ea60015 into openshift:main Mar 30, 2023
@openshift-cherrypick-robot

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

Applying: Start using RHEL 9.2 in the devenv and edge
Using index info to reconstruct a base tree...
M	docs/devenv_setup.md
M	scripts/devenv-builder/configure-vm.sh
M	scripts/image-builder/configure.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/image-builder/configure.sh
Auto-merging scripts/devenv-builder/configure-vm.sh
CONFLICT (content): Merge conflict in scripts/devenv-builder/configure-vm.sh
Auto-merging 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 in the devenv and edge
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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 30, 2023

@ggiguash: 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-openshift-conformance-reduced-arm ad0cb95 link unknown /test e2e-openshift-conformance-reduced-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.

ggiguash pushed a commit to ggiguash/microshift that referenced this pull request Mar 31, 2023
Start using RHEL 9.2 in the devenv and edge
openshift-merge-robot added a commit that referenced this pull request Mar 31, 2023
[release-4.13] OCPBUGS-10602: Merge pull request #1584
@ggiguash ggiguash deleted the devenv_use_rhel92 branch April 9, 2023 13:07
@copejon copejon mentioned this pull request May 2, 2023
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants