rename zuul jobs

hack/run-integration-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2023 VEXXHOST, Inc.
+# Copyright (c) 2024 VEXXHOST, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -14,18 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# This script will run the full functional tests for a given `KUBE_TAG`.  It
-# will download the image, create a cluster, wait for it to hit `CREATE_COMPLETE`
-# and then run `sonobuoy` against it.
-
-source /opt/stack/openrc
+source /opt/stack/openrc admin admin
 
 OS_DISTRO=${OS_DISTRO:-ubuntu}
 IMAGE_OS=${IMAGE_OS:-ubuntu-2204}
-NODE_COUNT=${NODE_COUNT:-2}
 NETWORK_DRIVER=${NETWORK_DRIVER:-calico}
-SONOBUOY_VERSION=${SONOBUOY_VERSION:-0.56.16}
-SONOBUOY_ARCH=${SONOBUOY_ARCH:-amd64}
 DNS_NAMESERVER=${DNS_NAMESERVER:-1.1.1.1}
 UPGRADE_KUBE_TAG=${UPGRADE_KUBE_TAG:-KUBE_TAG}
 IMAGE_NAME="${IMAGE_OS}-kube-${KUBE_TAG}"
@@ -42,6 +35,7 @@ fi
 # Upload image to Glance
 openstack image create \
   --disk-format=qcow2 \
+  --public \
   --container-format=bare \
   --property os_distro=${OS_DISTRO} \
   --file=${IMAGE_NAME}.qcow2 \
@@ -56,12 +50,50 @@ if [[ ${UPGRADE_KUBE_TAG} != ${KUBE_TAG} ]]; then
     # Upload Upgrade image to Glance
     openstack image create \
       --disk-format=qcow2 \
+      --public \
       --container-format=bare \
       --property os_distro=${OS_DISTRO} \
       --file=${UPGRADE_IMAGE_NAME}.qcow2 \
       ${UPGRADE_IMAGE_NAME}
 fi
 
+mkdir /tmp/magnum-nodes
+
+pushd /opt/stack/tempest
+echo "Tempest configs:"
+
+cat <<EOF >> /opt/stack/tempest/etc/tempest.conf
+
+[magnum]
+flavor_id = m1.large
+master_flavor_id = m1.large
+copy_logs = true
+network_driver = ${NETWORK_DRIVER}
+image_id = ${IMAGE_OS}-kube-${KUBE_TAG}
+coe = kubernetes
+labels = '{"kube_tag": "${KUBE_TAG}", "fixed_subnet_cidr": "10.0.0.0/26"}'
+docker_storage_driver = overlay
+
+EOF
+
+if [ ! -d /opt/stack/magnum-tempest-plugin ]; then
+    git clone https://github.com/openstack/magnum-tempest-plugin /opt/stack/magnum-tempest-plugin
+fi
+
+# install magnum-tempest-plugin
+pushd /opt/stack/magnum-tempest-plugin
+$HOME/.local/bin/pip3 install -e .
+popd
+
+echo "Run Tempest against configs:"
+cat /opt/stack/tempest/etc/tempest.conf
+
+echo "Run Tempest tests:"
+/opt/stack/data/venv/bin/tempest run -r '(^magnum_tempest_plugin)' \
+    --exclude-regex '^magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest\.(test_create_cluster_with_zero_nodes|test_create_list_sign_delete_clusters)'
+popd
+
+
 # Create cluster template
 openstack coe cluster template create \
     --image $(openstack image show ${IMAGE_NAME} -c id -f value) \
@@ -77,156 +109,121 @@ openstack coe cluster template create \
     --label fixed_subnet_cidr=192.168.24.0/24 \
     k8s-${KUBE_TAG};
 
-if [[ ${UPGRADE_KUBE_TAG} != ${KUBE_TAG} ]]; then
-    # Create cluster template for upgrade
-    openstack coe cluster template create \
-        --image $(openstack image show ${UPGRADE_IMAGE_NAME} -c id -f value) \
-        --external-network public \
-        --dns-nameserver ${DNS_NAMESERVER} \
-        --master-lb-enabled \
-        --master-flavor m1.large \
-        --flavor m1.large \
-        --network-driver ${NETWORK_DRIVER} \
-        --docker-storage-driver overlay2 \
-        --coe kubernetes \
-        --label kube_tag=${UPGRADE_KUBE_TAG} \
-        --label fixed_subnet_cidr=192.168.24.0/24 \
-        k8s-${UPGRADE_KUBE_TAG};
-fi
-
 # Create cluster
 openstack coe cluster create \
   --cluster-template k8s-${KUBE_TAG} \
   --master-count 1 \
-  --node-count ${NODE_COUNT} \
+  --node-count 1 \
   --merge-labels \
   --label audit_log_enabled=true \
-  k8s-cluster
+  k8s-cluster-test
 
 # Wait for cluster creation to be queued
 set +e
 for i in {1..5}; do
-  openstack coe cluster show k8s-cluster 2>&1
+  openstack coe cluster show k8s-cluster-test 2>&1
   exit_status=$?
   if [ $exit_status -eq 0 ]; then
       break
   else
-      echo "Error: Cluster k8s-cluster could not be found."
+      echo "Error: Cluster k8s-cluster-test could not be found."
       sleep 1
   fi
 done
 set -e
 
 # Wait for cluster to be "CREATE_COMPLETE".
 for i in {1..240}; do
-  CLUSTER_STATUS=$(openstack coe cluster show k8s-cluster -c status -f value)
+  CLUSTER_STATUS=$(openstack coe cluster show k8s-cluster-test -c status -f value)
   if [[ ${CLUSTER_STATUS} == *"FAILED"* ]]; then
     echo "Cluster failed to create"
     exit 1
   elif [[ ${CLUSTER_STATUS} == *"CREATE_COMPLETE"* ]]; then
     echo "Cluster created"
     break
   else
-    echo "Currtny retry count: $i"
+    echo "Current retry count: $i"
     echo "Cluster status: ${CLUSTER_STATUS}"
     sleep 5
   fi
 done
 
-# Get the cluster configuration file
-eval $(openstack coe cluster config k8s-cluster)
-
-# Download sonobuoy
-curl -LO https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_${SONOBUOY_ARCH}.tar.gz
-tar -xzf sonobuoy_${SONOBUOY_VERSION}_linux_${SONOBUOY_ARCH}.tar.gz
-
-# Run sonobuoy
-./sonobuoy run --wait --mode certified-conformance --plugin-env=e2e.E2E_PARALLEL=true
-
-# Retrieve results
-RESULTS_FILE=$(./sonobuoy retrieve --filename sonobuoy-results.tar.gz)
-
-# Print results
-./sonobuoy results ${RESULTS_FILE}
-
-
-# Fail if the Sonobuoy tests failed
-if ! ./sonobuoy results --plugin e2e ${RESULTS_FILE} | grep -q "Status: passed"; then
-  echo "Sonobuoy tests failed"
-  exit 1
-fi
+# Wait for kubernetes accessible and Ready.
+for i in {1..30}; do
+  # Get the cluster configuration file
+  eval $(openstack coe cluster config k8s-cluster-test)
+  Node=$(kubectl get node -o wide)
+  ready_count=$(echo $Node | grep -o " Ready " | wc -l)
+  tag_count=$(echo $Node | grep -o $KUBE_TAG | wc -l)
+  if [[ $ready_count -eq 2 && $tag_count -eq 2 ]]; then
+    echo "Kubernetes accessible with Ready node."
+    echo "Node status: ${Node}"
+    break
+  elif [[ $i -eq 30 ]]; then
+    echo "Failed: Unable to reach ready status for nodes..."
+    echo "Node status: ${Node}"
+    exit 1
+  else
+    echo "Current retry count: $i"
+    # echo "Node status: ${Node}"
+    sleep 5
+  fi
+done
 
 
 if [[ ${UPGRADE_KUBE_TAG} != ${KUBE_TAG} ]]; then
 
-    openstack coe cluster delete k8s-cluster
-    # Wait for cluster to be deleted
-    set +e
-    for i in {1..60}; do
-      openstack coe cluster show k8s-cluster 2>&1
-      exit_status=$?
-      if [ $exit_status -eq 0 ]; then
-          sleep 2
-      else
-          echo "Cluster k8s-cluster deleted."
-          break
-      fi
-    done
-    set -e
-    # Create cluster
-    openstack coe cluster create \
-      --cluster-template k8s-${KUBE_TAG} \
-      --master-count 1 \
-      --node-count 1 \
-      --merge-labels \
-      --label audit_log_enabled=true \
-      k8s-cluster-upgrade
-
-    # Wait for cluster creation to be queued
-    set +e
-    for i in {1..5}; do
-      openstack coe cluster show k8s-cluster-upgrade 2>&1
-      exit_status=$?
-      if [ $exit_status -eq 0 ]; then
-          break
-      else
-          echo "Error: Cluster k8s-cluster-upgrade could not be found."
-          sleep 1
-      fi
-    done
-    set -e
+    # Create cluster template for upgrade
+    openstack coe cluster template create \
+        --image $(openstack image show ${UPGRADE_IMAGE_NAME} -c id -f value) \
+        --external-network public \
+        --dns-nameserver ${DNS_NAMESERVER} \
+        --master-lb-enabled \
+        --master-flavor m1.large \
+        --flavor m1.large \
+        --network-driver ${NETWORK_DRIVER} \
+        --docker-storage-driver overlay2 \
+        --coe kubernetes \
+        --label kube_tag=${UPGRADE_KUBE_TAG} \
+        --label fixed_subnet_cidr=192.168.24.0/24 \
+        k8s-${UPGRADE_KUBE_TAG};
 
-    # Wait for cluster to be "CREATE_COMPLETE".
+    # Upgrade cluster
+    openstack coe cluster upgrade k8s-cluster-test k8s-${UPGRADE_KUBE_TAG}
+    # Wait for cluster to be "UPDATE_COMPLETE".
     for i in {1..240}; do
-      CLUSTER_STATUS=$(openstack coe cluster show k8s-cluster-upgrade -c status -f value)
+      CLUSTER_STATUS=$(openstack coe cluster show k8s-cluster-test -c status -f value)
       if [[ ${CLUSTER_STATUS} == *"FAILED"* ]]; then
-        echo "Cluster failed to create"
+        echo "Cluster failed to upgrade"
         exit 1
-      elif [[ ${CLUSTER_STATUS} == *"CREATE_COMPLETE"* ]]; then
-        echo "Cluster created"
+      elif [[ ${CLUSTER_STATUS} == *"UPDATE_COMPLETE"* ]]; then
+        echo "Cluster upgraded"
         break
       else
-        echo "Currtny retry count: $i"
+        echo "Current retry count: $i"
         echo "Cluster status: ${CLUSTER_STATUS}"
         sleep 5
       fi
     done
 
-    # Upgrade cluster
-    openstack coe cluster upgrade k8s-cluster-upgrade k8s-${UPGRADE_KUBE_TAG}
-    # Wait for cluster to be "UPDATE_COMPLETE".
-    for i in {1..240}; do
-      CLUSTER_STATUS=$(openstack coe cluster show k8s-cluster-upgrade -c status -f value)
-      if [[ ${CLUSTER_STATUS} == *"FAILED"* ]]; then
-        echo "Cluster failed to upgrade"
-        exit 1
-      elif [[ ${CLUSTER_STATUS} == *"UPDATE_COMPLETE"* ]]; then
-        echo "Cluster upgraded"
+    # Wait for kubernetes accessible and Ready.
+    for i in {1..30}; do
+      # Get the cluster configuration file
+      eval $(openstack coe cluster config k8s-cluster-test)
+      Node=$(kubectl get node -o wide)
+      ready_count=$(echo $Node | grep -o " Ready " | wc -l)
+      tag_count=$(echo $Node | grep -o $UPGRADE_KUBE_TAG | wc -l)
+      if [[ $ready_count -eq 2 && $tag_count -eq 2 ]]; then
+        echo "Kubernetes accessible with Ready node."
+        echo "Node status: ${Node}"
         exit 0
-        break
+      elif [[ $i -eq 30 ]]; then
+        echo "Failed: Unable to reach ready status for nodes..."
+        echo "Node status: ${Node}"
+        exit 1
       else
-        echo "Currtny retry count: $i"
-        echo "Cluster status: ${CLUSTER_STATUS}"
+        echo "Current retry count: $i"
+        # echo "Node status: ${Node}"
         sleep 5
       fi
     done