bump to latest kubevirtci

This update is for a rebuild of the okd 4.1 provider related to kubevirt/kubevirtci#172 Signed-off-by: Sebastian Sch <[email protected]>
stratustech · Nov 3, 2019 · 7212c25 · 7212c25
1 parent b903412
commit 7212c25
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/cluster-up-sha.txt b/cluster-up-sha.txt
@@ -1 +1 @@
-3b47a258b72cb6e5308a3b01326ac6e30cbe8ddc
+f6fb8836cd6f053726618e0a44b5dbe800bf7a82
diff --git a/cluster-up/check.sh b/cluster-up/check.sh
@@ -33,8 +33,19 @@ elif [ -f "/sys/module/kvm_amd/parameters/nested" ]; then
 	KVM_NESTED=$( cat /sys/module/kvm_amd/parameters/nested )
 	KVM_ARCH="amd"
 fi
-if [ "$KVM_NESTED" != "Y" ]; then
-	echo "[ERR ] $KVM_ARCH nested virtualization not enabled"
-else
+
+function is_enabled() {
+	if [ "$1" == "1" ]; then
+		return 0
+	fi
+	if [ "$1" == "Y" ] || [ "$1" == "y"]; then
+		return 0
+	fi
+	return 1
+}
+
+if is_enabled "$KVM_NESTED"; then
 	echo "[ OK ] $KVM_ARCH nested virtualization enabled"
+else
+	echo "[ERR ] $KVM_ARCH nested virtualization not enabled"
 fi
diff --git a/cluster-up/cluster/ephemeral-provider-common.sh b/cluster-up/cluster/ephemeral-provider-common.sh
@@ -2,9 +2,12 @@
 
 set -e
 
-_cli_container="kubevirtci/gocli@sha256:f6145018927094a6b62ac89fdb26f5901cb8030d9120f620b2490c9c9c25655a"
-_cli_with_tty="docker run --privileged --net=host --rm -t -v /var/run/docker.sock:/var/run/docker.sock ${_cli_container}"
-_cli="docker run --privileged --net=host --rm ${USE_TTY} -v /var/run/docker.sock:/var/run/docker.sock ${_cli_container}"
+if [ "${KUBEVIRTCI_RUNTIME}" = "podman" ]; then
+	_cli="pack8s"
+else
+	_cli_container="kubevirtci/gocli@sha256:f6145018927094a6b62ac89fdb26f5901cb8030d9120f620b2490c9c9c25655a"
+	_cli="docker run --privileged --net=host --rm ${USE_TTY} -v /var/run/docker.sock:/var/run/docker.sock ${_cli_container}"
+fi
 
 function _main_ip() {
     echo 127.0.0.1

diff --git a/cluster-up/cluster/okd-4.1/provider.sh b/cluster-up/cluster/okd-4.1/provider.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-image="okd-4.1@sha256:2b7b5e09b9bdf2ca40b8e153a111702584e2a3e802643e3e7df1f2d97eca0ce8"
+image="okd-4.1@sha256:b26decaf0454cc1f99b39b9bc991f715a8d6d8e97499db5a2d40f778430972f7"
 
 source ${KUBEVIRTCI_PATH}/cluster/ephemeral-provider-common.sh
 

diff --git a/cluster-up/version.txt b/cluster-up/version.txt
@@ -1 +1 @@
-b8675462ba038531cb76cfe2e877f70c540aeae4
+939594520a1ca5726b8aaeb2c1685d27e0b3687e
diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -10,7 +10,7 @@ cdi_namespace=cdi
 image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent}
 verbosity=${VERBOSITY:-2}
 package_name=${PACKAGE_NAME:-kubevirt-dev}
-kubevirtci_git_hash="b8675462ba038531cb76cfe2e877f70c540aeae4"
+kubevirtci_git_hash="939594520a1ca5726b8aaeb2c1685d27e0b3687e"
 
 # try to derive csv_version from docker tag. But it must start with x.y.z, without leading v
 default_csv_version="${docker_tag/latest/0.0.0}"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3b47a258b72cb6e5308a3b01326ac6e30cbe8ddc
		f6fb8836cd6f053726618e0a44b5dbe800bf7a82
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -e
-    image="okd-4.1@sha256:2b7b5e09b9bdf2ca40b8e153a111702584e2a3e802643e3e7df1f2d97eca0ce8"
+    image="okd-4.1@sha256:b26decaf0454cc1f99b39b9bc991f715a8d6d8e97499db5a2d40f778430972f7"
     source ${KUBEVIRTCI_PATH}/cluster/ephemeral-provider-common.sh
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b8675462ba038531cb76cfe2e877f70c540aeae4
		939594520a1ca5726b8aaeb2c1685d27e0b3687e