Skip to content

OCPBUGS-38974: Update openvswitch to 3.4 #3816

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.

Sign up for GitHub

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

Merged
openshift-merge-bot merged 2 commits into from
Aug 28, 2024
Merged

OCPBUGS-38974: Update openvswitch to 3.4 #3816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e4bf9
Update openvswitch to 3.4.
npinaeva Aug 26, 2024
97527ab
Allow erasing on package install for openvswitch version upgrades.
npinaeva Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ The microshift-selinux package provides the SELinux policy modules required by M
Summary: Networking components for MicroShift
Requires: microshift = %{version}
Obsoletes: openvswitch3.1 < 3.3
Requires: (openvswitch3.3 or openvswitch >= 3.3)
Requires: (openvswitch3.4 or openvswitch >= 3.4)
Requires: NetworkManager
Requires: NetworkManager-ovs
Requires: jq
Expand Down Expand Up @@ -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.17.0
- Update openvswitch to 3.4

* Mon Jul 29 2024 Patryk Matuszak <pmatusza@redhat.com> 4.17.0
- Add microshift-tuned daemon for unattended TuneD profile activation

Expand Down
5 changes: 4 additions & 1 deletion test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source-ostree-parent.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} && \
Expand Down
2 changes: 1 addition & 1 deletion test/kickstart-templates/includes/post-cos9rpm.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gpgcheck=0
skip_if_unavailable=0
EOF

# The openvswitch3.3 dependency
# The openvswitch package dependency
cat > "/etc/yum.repos.d/openvswitch2-rpms.repo" <<EOF
[sig-nfv]
name=CentOS Stream 9 - SIG NFV
Expand Down