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-38974: Update openvswitch to 3.4 #3816

Merged
merged 2 commits into from
Aug 28, 2024

Conversation

npinaeva
Copy link
Member

@npinaeva npinaeva commented Aug 26, 2024

Following ovn-k and RHCOS updates:
openshift/ovn-kubernetes#2273
openshift/os#1596
Depends on: https://issues.redhat.com/browse/ART-10428
previous bump: #3350

@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 Aug 26, 2024
@openshift-ci-robot
Copy link

@npinaeva: This pull request references Jira Issue OCPBUGS-38252, which is invalid:

  • expected the bug to target either version "4.18." or "openshift-4.18.", but it targets "4.17.0" 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:

Following ovn-k and RHCOS updates:
openshift/ovn-kubernetes#2273
openshift/os#1596

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.

@igsilya
Copy link
Contributor

igsilya commented Aug 26, 2024

@ggiguash similarly to the previous upgrade to 3.3 (#3350) the tests are failing due to missing --allowerasing, since OVS major varsions cannot be upgraded with a simple dnf install: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_microshift/3816/pull-ci-openshift-microshift-main-metal-bootc-test/1828089113358635008#1:build-log.txt%3A3801 . The failure this time in containerfiles that were not present before. Should they be updated?

@igsilya
Copy link
Contributor

igsilya commented Aug 26, 2024

I'm guessing something like this may help resolving the issue:

diff --git a/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source-ostree-parent.containerfile b/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source-ostree-parent.containerfile
index 82c285d66..a7a58237b 100644
--- a/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source-ostree-parent.containerfile
+++ b/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source-ostree-parent.containerfile
@@ -22,9 +22,12 @@ COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
 # - MicroShift local RPM repository
 # - OpenShift previous minor version RHEL repositories for MicroShift dependencies
 # Install MicroShift, test agent, a few helper utilities and cleanup
+#
+# Allow erasing because update may require a new version of openvswitch and
+# major versions of openvswitch are separate packages that obsolete each other.
 RUN ${REPO_CONFIG_SCRIPT} -create ${USHIFT_RPM_REPO_PATH} && \
     awk 'FNR==1 {print "=== " FILENAME " ==="} {print}' /etc/yum.repos.d/*.repo && \
-    dnf install -y vi firewalld microshift microshift-test-agent && \
+    dnf install -y --allowerasing vi firewalld microshift microshift-test-agent && \
     systemctl enable microshift microshift-test-agent && \
     ${REPO_CONFIG_SCRIPT} -delete && \
     rm -f ${REPO_CONFIG_SCRIPT} && \

@@ -519,6 +519,9 @@ fi
# Use Git command to generate the log and replace the VERSION string
# LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
%changelog
* Mon Aug 26 2024 Nadia Pinaeva <n.m.pinaeva@gmail.com> 4.18.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we planning to backport this fix to 4.17.0? If so, let's change the version to 4.17.0 here so that we can cherrypick the PR.

@ggiguash
Copy link
Contributor

/retitle OCPBUGS-38974: Update openvswitch to 3.4

@openshift-ci openshift-ci bot changed the title OCPBUGS-38252: Update openvswitch to 3.4 OCPBUGS-38974: Update openvswitch to 3.4 Aug 27, 2024
@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 Aug 27, 2024
@openshift-ci-robot
Copy link

@npinaeva: This pull request references Jira Issue OCPBUGS-38974, 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.18.0) matches configured target version for branch (4.18.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:

Following ovn-k and RHCOS updates:
openshift/ovn-kubernetes#2273
openshift/os#1596
Depends on: https://issues.redhat.com/browse/ART-10428
previous bump: #3350

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 August 27, 2024 06:32
@ggiguash
Copy link
Contributor

/test ?

Copy link
Contributor

openshift-ci bot commented Aug 27, 2024

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

  • /test footprint-and-performance
  • /test images
  • /test metal-bootc-periodic-test
  • /test metal-bootc-periodic-test-arm
  • /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 ocp-full-conformance-rhel-eus
  • /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-metal-bootc-test
  • pull-ci-openshift-microshift-main-metal-bootc-test-arm
  • 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 ocp-conformance-rhel-eus
/test ocp-conformance-rhel-eus-arm
/test metal-periodic-test
/test metal-periodic-test-arm

1 similar comment
@ggiguash
Copy link
Contributor

/test ocp-conformance-rhel-eus
/test ocp-conformance-rhel-eus-arm
/test metal-periodic-test
/test metal-periodic-test-arm

@ggiguash
Copy link
Contributor

Seeing CDN errors, retrying.

/test metal-periodic-test
/test metal-periodic-test-arm

@npinaeva
Copy link
Member Author

/test ocp-conformance-rhel-eus
/test ocp-conformance-rhel-eus-arm
/test metal-periodic-test
/test metal-periodic-test-arm

@ggiguash
Copy link
Contributor

/test metal-bootc-test-arm

@@ -8,7 +8,7 @@ gpgcheck=0
skip_if_unavailable=0
EOF

# The openvswitch3.3 dependency
# The openvswitch3.4 dependency
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's remove the version from the comment please.

Suggested change
# The openvswitch3.4 dependency
# The openvswitch package dependency

npinaeva and others added 2 commits August 28, 2024 11:28
Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Co-authored-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Copy link
Contributor

openshift-ci bot commented Aug 28, 2024

@npinaeva: 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.

@jogeo
Copy link
Contributor

jogeo commented Aug 28, 2024

Tested this branch from the MicroShift QE pipeline and everything passed.

@ggiguash
Copy link
Contributor

/lgtm
/cherry-pick release-4.17

@openshift-cherrypick-robot

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

In response to this:

/lgtm
/cherry-pick release-4.17

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.

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

openshift-ci bot commented Aug 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Aug 28, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 3fd74b6 into openshift:main Aug 28, 2024
9 checks passed
@openshift-ci-robot
Copy link

@npinaeva: Jira Issue OCPBUGS-38974: All pull requests linked via external trackers have merged:

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

In response to this:

Following ovn-k and RHCOS updates:
openshift/ovn-kubernetes#2273
openshift/os#1596
Depends on: https://issues.redhat.com/browse/ART-10428
previous bump: #3350

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

@ggiguash: new pull request created: #3823

In response to this:

/lgtm
/cherry-pick release-4.17

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.

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.

6 participants