Merge pull request #4034 from praveenkumar/USHIFT-4343

USHIFT-4343: Add test scenario for flannel CNI plugin

Author: openshift-merge-bot[bot]

Makefile

@@ -331,6 +331,7 @@ rpm-podman:
 		--rm -i \
 		--volume $$(pwd):/opt/microshift:z \
 		--env TARGET_ARCH=$(TARGET_ARCH) \
+		--env WITH_FLANNEL=$(WITH_FLANNEL) \
 		microshift-builder:$(RPM_BUILDER_IMAGE_TAG) \
 		bash -ilc 'cd /opt/microshift && make rpm & pid=$$! ; \
 				   trap "echo Killing make PID $${pid}; kill $${pid}" INT ; \

test/bin/ci_phase_iso_build.sh

@@ -125,7 +125,7 @@ cd "${ROOTDIR}/test/"
 source "${SCRIPTDIR}/common.sh"
 
 # Re-build from source.
-$(dry_run) bash -x ./bin/build_rpms.sh
+$(dry_run) env WITH_FLANNEL=1 bash -x ./bin/build_rpms.sh
 
 if ${COMPOSER_CLI_BUILDS} ; then
     # Determine and create the ideal number of workers

test/image-blueprints/layer5-bootc/group2/cos9-bootc-source-flannel.containerfile

@@ -0,0 +1,20 @@
+FROM localhost/cos9-bootc-source:latest
+
+# Build arguments
+ARG USHIFT_RPM_REPO_NAME=microshift-local
+ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
+
+# Copy the MicroShift repository contents
+COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
+
+# Copy repository configuration
+COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
+    /etc/yum.repos.d/
+
+# Print repository configuration contents.
+# Install MicroShift optional packages and cleanup.
+RUN dnf repoinfo --enabled && \
+    dnf install -y "microshift-flannel-{{ .Env.SOURCE_VERSION }}" && \
+    rm -vf /etc/yum.repos.d/microshift-*.repo && \
+    rm -rvf $USHIFT_RPM_REPO_PATH && \
+    dnf clean all

test/scenarios-bootc/periodics/[email protected]

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    prepare_kickstart host1 kickstart-bootc.ks.template cos9-bootc-source
+    launch_vm --boot_blueprint centos9-bootc --bootc
+
+    # Open the firewall ports. Other scenarios get this behavior by
+    # embedding settings in the blueprint, but there is no blueprint
+    # for this scenario. We need do this step before running the RF
+    # suite so that suite can assume it can reach all of the same
+    # ports as for any other test.
+    configure_vm_firewall host1
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 suites/standard1/networking-smoke.robot
+}