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-33588: Upgrade openvswitch package for 4.16 #3350

Merged
merged 2 commits into from
May 13, 2024

Conversation

igsilya
Copy link
Contributor

@igsilya igsilya commented May 13, 2024

4.16 ovn-kubernetes and RHCOS are both moved to OVS 3.3:

MicroShift should be kept in sync.

@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 13, 2024
Copy link
Contributor

openshift-ci bot commented May 13, 2024

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

@igsilya igsilya changed the title Upgrade openvswitch package for 4.16 OCPBUGS-33588: Upgrade openvswitch package for 4.16 May 13, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 13, 2024
@openshift-ci-robot
Copy link

@igsilya: This pull request references Jira Issue OCPBUGS-33588, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jogeo

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

In response to this:

4.16 ovn-kubernetes and RHCOS are both moved to OVS 3.3:

MicroShift should be kept in sync.

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 jogeo May 13, 2024 10:09
@igsilya igsilya marked this pull request as ready for review May 13, 2024 10:09
@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 13, 2024
@openshift-ci openshift-ci bot requested review from jerpeter1 and pmtk May 13, 2024 10:09
@igsilya
Copy link
Contributor Author

igsilya commented May 13, 2024

CC: @zshi-redhat

@zshi-redhat
Copy link
Contributor

@igsilya thanks for filing the PR for ovs bump!
I assume there has at least one OVS 3.3 patch version been released in FDP, could you confirm? Since microshift rpm needs to be installed with released ovs versions.
@pmtk which other rhel versions do we plan to support with microshift 4.16? (just want to make sure OVS 3.3 is also available in older rhel versions that microshift will support).

cc @pliurh

@igsilya
Copy link
Contributor Author

igsilya commented May 13, 2024

@igsilya thanks for filing the PR for ovs bump! I assume there has at least one OVS 3.3 patch version been released in FDP, could you confirm? Since microshift rpm needs to be installed with released ovs versions.

Yes, 3.3.0-2.el9fdp was officially released a couple weeks back.

@igsilya
Copy link
Contributor Author

igsilya commented May 13, 2024

Upgrade tests are failing because it is not possible to simply update between major versions of openvswitch package. The reason is that these are not the same package, but two different packages that obsolete each other, hence simple dnf install -y can't install them without --allowerasing. Should I add --allowerasing to the test?

@dhellmann

@dhellmann
Copy link
Contributor

Upgrade tests are failing because it is not possible to simply update between major versions of openvswitch package. The reason is that these are not the same package, but two different packages that obsolete each other, hence simple dnf install -y can't install them without --allowerasing. Should I add --allowerasing to the test?

@dhellmann

Please work with @jerpeter1 and @ggiguash on this, I'm not on the MicroShift team any longer. Thank you!

@ggiguash
Copy link
Contributor

Upgrade tests are failing because it is not possible to simply update between major versions of openvswitch package. The reason is that these are not the same package, but two different packages that obsolete each other, hence simple dnf install -y can't install them without --allowerasing. Should I add --allowerasing to the test?

@dhellmann

Upgrade tests are failing because it is not possible to simply update between major versions of openvswitch package. The reason is that these are not the same package, but two different packages that obsolete each other, hence simple dnf install -y can't install them without --allowerasing. Should I add --allowerasing to the test?

Let's try adding --allowerasing in the test to see if this is working. We would have to also update the docs with this note.

@igsilya igsilya force-pushed the ovs-3.3 branch 2 times, most recently from eb30d99 to c1e6bd0 Compare May 13, 2024 12:19
@igsilya
Copy link
Contributor Author

igsilya commented May 13, 2024

Let's try adding --allowerasing in the test to see if this is working. We would have to also update the docs with this note.

@ggiguash the tests passed. Where do you think the documentation update should go?

@ggiguash
Copy link
Contributor

@ShaunaDiaz , we need documentation update for MicroShift upgrade from previous versions to 4.16.
It's about adding --allowerasing options when doing dnf install on new packages.
Should we open a new ticket or use the attached bug for making the doc changes?

@ggiguash
Copy link
Contributor

/test ?

Copy link
Contributor

openshift-ci bot commented May 13, 2024

@ggiguash: The following commands are available to trigger required jobs:

  • /test images
  • /test metal-bootc-test
  • /test metal-bootc-test-arm
  • /test metal-periodic-test
  • /test metal-periodic-test-arm
  • /test microshift-metal-cache
  • /test microshift-metal-cache-arm
  • /test microshift-metal-tests
  • /test microshift-metal-tests-arm
  • /test ocp-conformance-rhel-eus
  • /test ocp-conformance-rhel-eus-arm
  • /test test-rpm
  • /test test-unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test test-rebase

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

  • pull-ci-openshift-microshift-main-images
  • pull-ci-openshift-microshift-main-microshift-metal-tests
  • pull-ci-openshift-microshift-main-microshift-metal-tests-arm
  • pull-ci-openshift-microshift-main-test-rpm
  • pull-ci-openshift-microshift-main-test-unit
  • pull-ci-openshift-microshift-main-verify

In response to this:

/test ?

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.

@ggiguash
Copy link
Contributor

/test metal-bootc-test
/test metal-bootc-test-arm

@ShaunaDiaz
Copy link

@ShaunaDiaz , we need documentation update for MicroShift upgrade from previous versions to 4.16. It's about adding --allowerasing options when doing dnf install on new packages. Should we open a new ticket or use the attached bug for making the doc changes?

Issue created here: https://issues.redhat.com/browse/OSDOCS-10554.

@ggiguash
Copy link
Contributor

ggiguash commented May 13, 2024

@igsilya , it looks like CentOS 9 installation does not work

cos9-bootc-source: Package vim-minimal-2:8.2.2637-20.el9.aarch64 is already installed.
cos9-bootc-source: Error: 
cos9-bootc-source:  Problem: package microshift-4.16.0_0.nightly_arm64_2024_05_13_005028_20240513121611_5bc78baf3d3956865112e7b8d4598f8a50683832-1.el9.aarch64 from microshift-local requires microshift-networking = 4.16.0_0.nightly_arm64_2024_05_13_005028_20240513121611_5bc78baf3d3956865112e7b8d4598f8a50683832, but none of the providers can be installed
cos9-bootc-source:   - conflicting requests
cos9-bootc-source:   - nothing provides (openvswitch3.3 or openvswitch >= 3.3) needed by microshift-networking-4.16.0_0.nightly_arm64_2024_05_13_005028_20240513121611_5bc78baf3d3956865112e7b8d4598f8a50683832-1.el9.aarch64 from microshift-local
cos9-bootc-source: (try to add '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages)
cos9-bootc-source: Error: building at STEP "RUN ${REPO_CONFIG_SCRIPT} -create ${USHIFT_RPM_REPO_PATH} &&     dnf install -y vi firewalld microshift &&     systemctl enable microshift &&     ${REPO_CONFIG_SCRIPT} -delete &&     rm -f ${REPO_CONFIG_SCRIPT} &&     rm -rf $USHIFT_RPM_REPO_PATH &&     dnf clean all": while running runtime: exit status 1

Should we fix this somehow?

/hold

@ggiguash
Copy link
Contributor

Do we need to add another repo also here?

@igsilya
Copy link
Contributor Author

igsilya commented May 13, 2024

@ggiguash enabling openshift-mirror-beta repo for centos seems generally wrong to me. This repo only contains packages that are directly tagged into openshift and not available otherwise. Since openvswitch3.3 is available directly from fast-datapath repo, it is not explicitly tagged into that special repo. Hence, CI can't find it.

The openvswitch2 repo seems more reasonable. Though a better solution might be to install centos-release-nfv-openvswitch package that will enable necessary repos.

@ggiguash
Copy link
Contributor

MicroShift needs the openshift-client package, which is only available from mirror for CentOS.
So, it looks like we need to enable both repos, to implement a workaround like here.

I think we just need to add the openvswitch repo...

@igsilya
Copy link
Contributor Author

igsilya commented May 13, 2024

OK, let me try to add the repo...

openshift-mirror-beta repo only contains packages that are directly
tagged into openshift and not available otherwise.  It doesn't
contain openvswitch versions that are available directly in actual
fast-datapath repositories.  OVS packages for CentOS are available
in sig-nfv repo instead.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
4.16 ovn-kubernetes and RHCOS are both moved to OVS 3.3:
  - openshift/ovn-kubernetes#2142
  - openshift/os#1495

MicroShift should be kept in sync.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
@ggiguash
Copy link
Contributor

/test metal-bootc-test
/test metal-bootc-test-arm

Copy link
Contributor

openshift-ci bot commented May 13, 2024

@igsilya: all tests passed!

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.

@ggiguash
Copy link
Contributor

/lgtm

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

openshift-ci bot commented May 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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 May 13, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 72ba40c into openshift:main May 13, 2024
9 checks passed
@openshift-ci-robot
Copy link

@igsilya: Jira Issue OCPBUGS-33588: All pull requests linked via external trackers have merged:

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

In response to this:

4.16 ovn-kubernetes and RHCOS are both moved to OVS 3.3:

MicroShift should be kept in sync.

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.

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

6 participants