fix tempest

vexxhost · Nov 28, 2024 · ff81fdf · ff81fdf
1 parent 269379f
commit ff81fdf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/hack/run-tempest-tests.sh b/hack/run-tempest-tests.sh
@@ -61,7 +61,30 @@ if [[ ${UPGRADE_KUBE_TAG} != ${KUBE_TAG} ]]; then
       ${UPGRADE_IMAGE_NAME}
 fi
 
+pushd /opt/stack/magnum-tempest-plugin
+source /opt/stack/data/venv/bin/activate
+pip install .
+popd
 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
+
+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

diff --git a/hack/stack.sh b/hack/stack.sh
@@ -120,10 +120,7 @@ $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 .
+$HOME/.local/bin/pip3 install -e .
 popd
 
 # Restart Magnum to pick-up new driver

diff --git 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
diff --git 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