Merge pull request #6504 from pacevedom/USHIFT-6818

openshift-merge-bot[bot] · web-flow · commit 83a538ac9e9b · 2026-04-16T07:13:39.000Z
USHIFT-6818: Update optional packages for y2 and y1 releases
diff --git a/test/bin/common.sh b/test/bin/common.sh
@@ -385,11 +385,11 @@ MICROSHIFT_Y2_OPTIONAL_RPMS_LIST=(
     microshift-observability
     microshift-cert-manager
     microshift-cert-manager-release-info
+    microshift-sriov
+    microshift-sriov-release-info
 )
 MICROSHIFT_Y1_OPTIONAL_RPMS_LIST=(
     "${MICROSHIFT_Y2_OPTIONAL_RPMS_LIST[@]}"
-    microshift-sriov
-    microshift-sriov-release-info
 )
 MICROSHIFT_OPTIONAL_RPMS_LIST=(
     "${MICROSHIFT_Y1_OPTIONAL_RPMS_LIST[@]}"

Original file line number	Diff line number	Diff line change
`@@ -385,11 +385,11 @@ MICROSHIFT_Y2_OPTIONAL_RPMS_LIST=(`
`385`	`385`	`microshift-observability`
`386`	`386`	`microshift-cert-manager`
`387`	`387`	`microshift-cert-manager-release-info`
	`388`	`+ microshift-sriov`
	`389`	`+ microshift-sriov-release-info`
`388`	`390`	`)`
`389`	`391`	`MICROSHIFT_Y1_OPTIONAL_RPMS_LIST=(`
`390`	`392`	`"${MICROSHIFT_Y2_OPTIONAL_RPMS_LIST[@]}"`
`391`		`- microshift-sriov`
`392`		`- microshift-sriov-release-info`
`393`	`393`	`)`
`394`	`394`	`MICROSHIFT_OPTIONAL_RPMS_LIST=(`
`395`	`395`	`"${MICROSHIFT_Y1_OPTIONAL_RPMS_LIST[@]}"`