Merge pull request #966 from SchSeba/update_ci_system

update the CI deploy scripts for new runners

Author: SchSeba

hack/run-e2e-conformance-virtual-cluster.sh

@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
 set -xeo pipefail
 
-cluster_version=${CLUSTER_VERSION:-1.32.0}
+cluster_version=${CLUSTER_VERSION:-1.34.2}
 cluster_name=${CLUSTER_NAME:-virtual}
 domain_name=$cluster_name.lab
 
 api_ip=${API_IP:-192.168.124.250}
 virtual_router_id=${VIRTUAL_ROUTER_ID:-250}
-HOME="/root"
 
 here="$(dirname "$(readlink --canonicalize "${BASH_SOURCE[0]}")")"
 root="$(readlink --canonicalize "$here/..")"
@@ -50,6 +49,7 @@ kcli delete network $cluster_name -y
 function cleanup {
   kcli delete cluster $cluster_name -y
   kcli delete network $cluster_name -y
+  sudo rm -f /etc/containers/registries.conf.d/003-${cluster_name}.conf
 }
 
 if [ -z $SKIP_DELETE ]; then
@@ -154,9 +154,10 @@ insecure = true
 \"golang\" = \"docker.io/library/golang\"
 "
 
-cat << EOF > /etc/containers/registries.conf.d/003-${cluster_name}.conf
+sudo bash -c "cat << EOF > /etc/containers/registries.conf.d/003-${cluster_name}.conf
 $insecure_registry
 EOF
+"
 
 function update_host() {
     node_name=$1

hack/run-e2e-conformance-virtual-ocp.sh

@@ -1,15 +1,14 @@
 #!/usr/bin/env bash
 set -xeo pipefail
 
-OCP_VERSION=${OCP_VERSION:-4.18}
+OCP_VERSION=${OCP_VERSION:-4.20.3}
 OCP_RELEASE_TYPE=${OCP_RELEASE_TYPE:-stable}
 cluster_name=${CLUSTER_NAME:-ocp-virt}
 domain_name=lab
 
 api_ip=${API_IP:-192.168.123.253}
 virtual_router_id=${VIRTUAL_ROUTER_ID:-253}
 registry="default-route-openshift-image-registry.apps.${cluster_name}.${domain_name}"
-HOME="/root"
 
 NUM_OF_WORKERS=${NUM_OF_WORKERS:-3}
 total_number_of_nodes=$((1 + NUM_OF_WORKERS))
@@ -43,6 +42,7 @@ kcli delete network $cluster_name -y
 function cleanup {
   kcli delete cluster $cluster_name -y
   kcli delete network $cluster_name -y
+  sudo rm -f /etc/containers/registries.conf.d/003-${cluster_name}.conf
 }
 
 if [ -z $SKIP_DELETE ]; then
@@ -67,7 +67,7 @@ ctlplanes: 1
 workers: $NUM_OF_WORKERS
 machine: q35
 network_type: OVNKubernetes
-pull_secret: /root/openshift_pull.json
+pull_secret: $HOME/openshift_pull.json
 vmrules:
   - $cluster_name-worker-.*:
       nets:
@@ -136,7 +136,7 @@ controller_ip=`kubectl get node -o wide | grep ctlp | awk '{print $6}'`
 
 if [ `cat /etc/hosts | grep ${api_ip} | grep "default-route-openshift-image-registry.apps.${cluster_name}.${domain_name}" | wc -l` == 0 ]; then
   echo "adding registry to hosts"
-  sed -i "s/${api_ip}/${api_ip} default-route-openshift-image-registry.apps.${cluster_name}.${domain_name}/g" /etc/hosts
+  sudo sed -i "s/${api_ip}/${api_ip} default-route-openshift-image-registry.apps.${cluster_name}.${domain_name}/g" /etc/hosts
 fi