Native zuul v3 grenade job

Based on the native 'grenade' job. This backport does not remove the scenario-py3 job, which is needed on this branch. Story: 2001686 Depends-On: https://review.opendev.org/736284 Change-Id: I7efddc3c9bbf3ea9c635d6cbe5835e46de017ec3 (cherry picked from commit f19873d3ac) (cherry picked from commit 5cacd65769)
2020-06-25 19:11:43 +02:00 · 2020-06-25 19:11:43 +02:00 · 8e93408266
parent 45d9097e4b
commit 8e93408266
3 changed files with 46 additions and 105 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -44,25 +44,53 @@

 - job:
    name: sahara-grenade
-    parent: legacy-dsvm-base
-    run: playbooks/sahara-grenade/run.yaml
-    post-run: playbooks/sahara-grenade/post.yaml
-    timeout: 10800
+    parent: grenade
    required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/sahara
-      - openstack/python-saharaclient
-      - openstack/heat
-      - openstack/heat-tempest-plugin
-      - openstack/python-heatclient
-      - openstack/sahara-tests
-      - openstack/sahara-plugin-ambari
-      - openstack/sahara-plugin-cdh
-      - openstack/sahara-plugin-mapr
-      - openstack/sahara-plugin-spark
-      - openstack/sahara-plugin-storm
-      - openstack/sahara-plugin-vanilla
+      - opendev.org/openstack/grenade
+      - opendev.org/openstack/sahara
+      - opendev.org/openstack/python-saharaclient
+      - opendev.org/openstack/heat
+      - opendev.org/openstack/heat-tempest-plugin
+      - opendev.org/openstack/python-heatclient
+      - opendev.org/openstack/sahara-tests
+      - opendev.org/openstack/sahara-plugin-ambari
+      - opendev.org/openstack/sahara-plugin-cdh
+      - opendev.org/openstack/sahara-plugin-mapr
+      - opendev.org/openstack/sahara-plugin-spark
+      - opendev.org/openstack/sahara-plugin-storm
+      - opendev.org/openstack/sahara-plugin-vanilla
+    vars:
+      grenade_localrc:
+        RUN_HEAT_INTEGRATION_TESTS: False
+      grenade_devstack_localrc:
+        shared:
+          IMAGE_URLS: http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2,https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            data_processing:
+              test_image_name: xenial-server-cloudimg-amd64-disk1
+              test_ssh_user: ubuntu
+            data-processing-feature-enabled:
+              s3: True
+      devstack_plugins:
+        sahara: https://opendev.org/openstack/sahara
+        heat: https://opendev.org/openstack/heat
+      devstack_services:
+        h-api: true
+        h-api-cfn: true
+        h-eng: true
+        heat: true
+        tls-proxy: false
+      tempest_plugins:
+        - sahara-tests
+        - heat-tempest-plugin
+      tempest_test_regex: ^(sahara_tempest_plugin.tests.)
+      tox_envlist: all
+    group-vars:
+      subnode:
+        devstack_services:
+          tls-proxy: false
    irrelevant-files:
      - ^(test-|)requirements.txt$
      - ^.*\.rst$
--- a/playbooks/sahara-grenade/post.yaml
+++ b/playbooks/sahara-grenade/post.yaml
@ -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
--- a/playbooks/sahara-grenade/run.yaml
+++ b/playbooks/sahara-grenade/run.yaml
@ -1,72 +0,0 @@
- hosts: all
-  name: Autoconverted job legacy-grenade-dsvm-sahara from old job gate-grenade-dsvm-sahara-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy 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:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          RUN_HEAT_INTEGRATION_TESTS=False
-          TEMPEST_PLUGINS+=' ../heat-tempest-plugin ../sahara-tests'
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export PROJECTS="openstack/sahara $PROJECTS"
-          export PROJECTS="openstack/python-saharaclient $PROJECTS"
-          export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
-          export PROJECTS="openstack/python-heatclient $PROJECTS"
-          export PROJECTS="openstack/sahara-tests $PROJECTS"
-          export PROJECTS="openstack/sahara-plugin-ambari $PROJECTS"
-          export PROJECTS="openstack/sahara-plugin-cdh $PROJECTS"
-          export PROJECTS="openstack/sahara-plugin-mapr $PROJECTS"
-          export PROJECTS="openstack/sahara-plugin-spark $PROJECTS"
-          export PROJECTS="openstack/sahara-plugin-storm $PROJECTS"
-          export PROJECTS="openstack/sahara-plugin-vanilla $PROJECTS"
-          export PYTHONUNBUFFERED=true
-          export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://opendev.org/openstack/sahara"
-          export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://opendev.org/openstack/heat"
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="sahara_tempest_plugin.tests.api"
-          export DEVSTACK_GATE_GRENADE=pullup
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          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 }}'