diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 4bfbc6c4b3..6a225b5fb0 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -108,7 +108,7 @@ The microshift-selinux package provides the SELinux policy modules required by M %package networking Summary: Networking components for MicroShift Requires: microshift = %{version} -Requires: (openvswitch3.1 or openvswitch >= 3.1) +Requires: (openvswitch3.3 or openvswitch >= 3.3) Requires: NetworkManager Requires: NetworkManager-ovs Requires: jq @@ -470,6 +470,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 May 13 2024 Ilya Maximets 4.16.0 +- Upgrade openvswitch package version to 3.3 + * Mon Apr 29 2024 Gregory Giguashvili 4.16.0 - Remove references to redundant files in selinux packaging diff --git a/test/bootc-sources/microshift_repo_config.sh.template b/test/bootc-sources/microshift_repo_config.sh.template index 34979671aa..855bd16454 100644 --- a/test/bootc-sources/microshift_repo_config.sh.template +++ b/test/bootc-sources/microshift_repo_config.sh.template @@ -5,6 +5,7 @@ USHIFT_LOCAL_REPO_FILE=/etc/yum.repos.d/microshift-local.repo OCP_MIRROR_REPO_FILE=/etc/yum.repos.d/openshift-mirror-beta.repo OCP_DTPATH_REPO_FILE=/etc/yum.repos.d/openshift-fast-datapath.repo OCP_RHOCP_REPO_FILE=/etc/yum.repos.d/openshift-rhocp.repo +CENTOS_NFV_SIG_REPO_FILE=/etc/yum.repos.d/microshift-sig-nfv.repo usage() { echo "Usage: $(basename $0) <-create microshift_local_repo_path | -delete>" @@ -39,6 +40,15 @@ baseurl=https://mirror.openshift.com/pub/openshift-v4/{{ .Env.UNAME_M }}/depende enabled=1 gpgcheck=0 skip_if_unavailable=0 +EOF + + cat > "${CENTOS_NFV_SIG_REPO_FILE}" < "/etc/yum.repos.d/openvswitch2-rpms.repo" <