diff --git a/hack/run-e2e-conformance-virtual-cluster.sh b/hack/run-e2e-conformance-virtual-cluster.sh index 8f9f2c4403..e67d225105 100755 --- a/hack/run-e2e-conformance-virtual-cluster.sh +++ b/hack/run-e2e-conformance-virtual-cluster.sh @@ -254,6 +254,21 @@ podman push --tls-verify=false "${SRIOV_NETWORK_OPERATOR_IMAGE}" podman push --tls-verify=false "${SRIOV_NETWORK_CONFIG_DAEMON_IMAGE}" podman push --tls-verify=false "${SRIOV_NETWORK_WEBHOOK_IMAGE}" +if [[ -v LOCAL_SRIOV_CNI_IMAGE ]]; then + export SRIOV_CNI_IMAGE="$controller_ip:5000//sriov-cni:latest" + echo "## Pushing ${LOCAL_SRIOV_CNI_IMAGE} to cluster iamge ${SRIOV_CNI_IMAGE}" + podman tag ${LOCAL_SRIOV_CNI_IMAGE} ${SRIOV_CNI_IMAGE} + podman push ${SRIOV_CNI_IMAGE} +fi + +if [[ -v LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE ]]; then + export SRIOV_DEVICE_PLUGIN_IMAGE="$controller_ip:5000//sriov-network-device-plugin:latest" + echo "## Pushing ${LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE} to cluster iamge ${SRIOV_SRIOV_DEVICE_PLUGIN_IMAGE}" + podman tag ${LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE} ${SRIOV_SRIOV_DEVICE_PLUGIN_IMAGE} + podman push ${SRIOV_DEVICE_PLUGIN_IMAGE} +fi + + # remove the crio bridge and let flannel to recreate kcli ssh $cluster_name-ctlplane-0 << EOF sudo su diff --git a/hack/run-e2e-conformance-virtual-ocp.sh b/hack/run-e2e-conformance-virtual-ocp.sh index a23410b040..42b7dc158d 100755 --- a/hack/run-e2e-conformance-virtual-ocp.sh +++ b/hack/run-e2e-conformance-virtual-ocp.sh @@ -204,6 +204,20 @@ podman push --tls-verify=false "${SRIOV_NETWORK_OPERATOR_IMAGE}" podman push --tls-verify=false "${SRIOV_NETWORK_CONFIG_DAEMON_IMAGE}" podman push --tls-verify=false "${SRIOV_NETWORK_WEBHOOK_IMAGE}" +if [[ -v LOCAL_SRIOV_CNI_IMAGE ]]; then + export SRIOV_CNI_IMAGE="$registry/$NAMESPACE/sriov-cni:latest" + echo "## Pushing ${LOCAL_SRIOV_CNI_IMAGE} to cluster iamge ${SRIOV_CNI_IMAGE}" + podman tag ${LOCAL_SRIOV_CNI_IMAGE} ${SRIOV_CNI_IMAGE} + podman push ${SRIOV_CNI_IMAGE} +fi + +if [[ -v LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE ]]; then + export SRIOV_DEVICE_PLUGIN_IMAGE="$registry/$NAMESPACE/sriov-network-device-plugin:latest" + echo "## Pushing ${LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE} to cluster iamge ${SRIOV_SRIOV_DEVICE_PLUGIN_IMAGE}" + podman tag ${LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE} ${SRIOV_SRIOV_DEVICE_PLUGIN_IMAGE} + podman push ${SRIOV_DEVICE_PLUGIN_IMAGE} +fi + podman logout $registry echo "## apply CRDs"