From b0fb5627ec21ed7f9e31ecb7b1aa94dae64c8194 Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Mon, 25 Nov 2024 19:55:50 +0800
Subject: [PATCH] fix tempest

---
 hack/run-tempest-tests.sh         | 33 ++++++++++++++++++++++++++++++-
 hack/stack.sh                     |  9 ---------
 zuul.d/jobs.yaml                  |  1 -
 zuul.d/playbooks/tempest/post.yml |  9 ---------
 zuul.d/playbooks/tempest/run.yml  |  6 ------
 5 files changed, 32 insertions(+), 26 deletions(-)
 delete mode 100644 zuul.d/playbooks/tempest/post.yml

diff --git a/hack/run-tempest-tests.sh b/hack/run-tempest-tests.sh
index 46cac1a7..a8812c13 100755
--- a/hack/run-tempest-tests.sh
+++ b/hack/run-tempest-tests.sh
@@ -61,9 +61,40 @@ if [[ ${UPGRADE_KUBE_TAG} != ${KUBE_TAG} ]]; then
       ${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 = overlay2
+
+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)'
+    --exclude-regex '^magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_zero_nodes'
 popd
 
 
diff --git a/hack/stack.sh b/hack/stack.sh
index e7c10a7f..4ed4a969 100755
--- a/hack/stack.sh
+++ b/hack/stack.sh
@@ -117,14 +117,5 @@ EOF
 pip install -U setuptools pip python-magnumclient
 $HOME/.local/bin/pip3 install -e .
 
-# install magnum-tempest-plugin with fix
-git clone https://github.com/openstack/magnum-tempest-plugin /opt/stack/magnum-tempest-plugin
-pushd /opt/stack/magnum-tempest-plugin
-git fetch https://review.opendev.org/openstack/magnum-tempest-plugin refs/changes/41/935741/1 && git checkout FETCH_HEAD
-source /opt/stack/data/venv/bin/activate
-#$HOME/.local/bin/pip3 install -e .
-pip install .
-popd
-
 # Restart Magnum to pick-up new driver
 sudo systemctl restart devstack@magnum-{api,cond}
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 65c54b8b..2be8a343 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -35,7 +35,6 @@
     abstract: true
     timeout: 7200
     run: zuul.d/playbooks/tempest/run.yml
-    post-run: zuul.d/playbooks/tempest/post.yml
     nodeset:
       nodes:
         - name: ubuntu-jammy
diff --git a/zuul.d/playbooks/tempest/post.yml b/zuul.d/playbooks/tempest/post.yml
deleted file mode 100644
index 00b5f62b..00000000
--- a/zuul.d/playbooks/tempest/post.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: all
-  tasks:
-    - name: Return built artifacts to Zuul
-      zuul_return:
-        data:
-          zuul:
-            artifacts:
-              - name: "tempest Results"
-                url: "artifacts/tempest.log"
diff --git a/zuul.d/playbooks/tempest/run.yml b/zuul.d/playbooks/tempest/run.yml
index d2d6de77..61d407cf 100644
--- a/zuul.d/playbooks/tempest/run.yml
+++ b/zuul.d/playbooks/tempest/run.yml
@@ -63,9 +63,3 @@
         BUILD_NEW_IMAGE: "{{ fetch_artifact.changed }}"
         BUILD_NEW_UPGRADE_IMAGE: "{{ fetch_artifact_upgrade.changed }}"
         NETWORK_DRIVER: "{{ network_driver }}"
-
-    - name: Copy Tempest results to output folder
-      copy:
-        src: "/opt/stack/tempest/tempest.log"
-        dest: "{{ zuul_output_dir }}/artifacts/tempest.log"
-        remote_src: true