Merge "Convert nova-next to a zuul v3 job"

3 files changed, 4 insertions, 100 deletions

diff --git a/playbooks/legacy/nova-next/post.yaml b/playbooks/legacy/nova-next/post.yaml
deleted file mode 100644
index e07f5510ae..0000000000
--- a/playbooks/legacy/nova-next/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/nova-next/run.yaml b/playbooks/legacy/nova-next/run.yaml
deleted file mode 100644
index c533b634c3..0000000000
--- a/playbooks/legacy/nova-next/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
-  name: nova-next
-  tasks:
-
-    - name: Ensure workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        # Enable TLS between the noVNC proxy & compute nodes; this requires
-        # the tls-proxy service to be enabled.
-
-        # Switch off the provider association refresh, which should reduce the
-        # number of placement calls in steady state.
-        # TODO(efried): Due to bug #1802143, nova-cpu.conf gets overwritten
-        # after post-config|$NOVA_CPU_CONF gets effected, so use $NOVA_CONF
-        # instead for now.
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          NOVA_USE_SERVICE_TOKEN=True
-          NOVA_CONSOLE_PROXY_COMPUTE_TLS=True
-          USE_PYTHON3=True
-          ENABLE_VOLUME_MULTIATTACH=True
-
-          [[post-config|$NOVA_CONF]]
-          [compute]
-          resource_provider_association_refresh = 0
-          [quota]
-          count_usage_from_placement = True
-
-          [scheduler]
-          query_placement_for_image_type_support = True
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ENABLED_SERVICES=tls-proxy
-          export PYTHONUNBUFFERED=true
-          # Yes we want to run Tempest.
-          export DEVSTACK_GATE_TEMPEST=1
-          # Run all compute API tests and most scenario tests at the default
-          # concurrency (nproc/2 which is normally 4 in the gate).
-          # The tempest.scenario.test_network* tests are skipped because they
-          # (1) take a long time and (2) are already covered in the
-          # tempest-slow* job.
-          export DEVSTACK_GATE_TEMPEST_REGEX="^tempest\.((scenario(?!\.test_network))|(api\.compute))"
-          # The post_test_hook runs some post-test CLIs for things that
-          # Tempest does not test, like archiving deleted records.
-          function post_test_hook {
-              if [ -f $BASE/new/nova/gate/post_test_hook.sh ]; then
-                  $BASE/new/nova/gate/post_test_hook.sh
-              fi
-          }
-          export -f post_test_hook
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/nova-next/post.yaml b/playbooks/nova-next/post.yaml
new file mode 100644
index 0000000000..e76decf7a6
--- /dev/null
+++ b/playbooks/nova-next/post.yaml
@@ -0,0 +1,4 @@
+- hosts: controller
+  roles:
+    # Runs gate/post_test_hook.sh to test things like nova-manage commands.
+    - run-post-test-hook