diff options
author | Luigi Toscano <ltoscano@redhat.com> | 2020-05-08 16:06:46 +0530 |
---|---|---|
committer | ramishra <ramishra@redhat.com> | 2021-04-04 15:10:48 +0530 |
commit | 664cab8857f24a38f622a499e4390a4539e47ef3 (patch) | |
tree | 488f58890c656339747d6694b95222267ecbf318 | |
parent | 069c4db8fed218702c9cd08d773c5ea9a0807fb0 (diff) | |
download | heat-664cab8857f24a38f622a499e4390a4539e47ef3.tar.gz |
Add native grenade zuul v3 jobs
Moved from https://review.opendev.org/#/c/639774/
Task: 40166
Change-Id: Id7f9be610e99cac9cf1f097066cc8748752d92dd
(cherry picked from commit 86fc1740c405e73c094012e8d341cf9d1e71e347)
-rw-r--r-- | .zuul.yaml | 42 | ||||
-rw-r--r-- | playbooks/devstack/grenade/run.yaml | 61 | ||||
-rw-r--r-- | playbooks/devstack/multinode-networking/pre.yaml | 3 |
3 files changed, 17 insertions, 89 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index bae4c4d8b..f0db24327 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -70,38 +70,30 @@ - job: name: grenade-heat - parent: legacy-dsvm-base - run: playbooks/devstack/grenade/run.yaml - post-run: playbooks/devstack/functional/post.yaml - timeout: 7800 + parent: grenade required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/heat - - openstack/heat-tempest-plugin - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^api-ref/.*$ - - ^doc/.*$ - - ^heat/locale/.*$ - - ^heat/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ + - opendev.org/openstack/heat + - opendev.org/openstack/heat-tempest-plugin + - opendev.org/openstack/python-heatclient vars: configure_swap_size: 8192 - topology: aio - branch_override: default + devstack_services: + h-api: true + h-api-cfn: true + h-eng: true + heat: true + # We do run a list of tests after upgrade. This is just to bypass the req from parent. + tempest_test_regex: ^heat_tempest_plugin\.tests\.functional\.test_nova_server_networks + tox_envlist: all + devstack_plugins: + heat: https://opendev.org/openstack/heat + tempest_plugins: + - heat-tempest-plugin - job: name: grenade-heat-multinode parent: grenade-heat - nodeset: ubuntu-bionic-2-node - roles: - - zuul: zuul/zuul-jobs - pre-run: playbooks/devstack/multinode-networking/pre.yaml - vars: - topology: multinode + nodeset: openstack-two-node-bionic - project: templates: diff --git a/playbooks/devstack/grenade/run.yaml b/playbooks/devstack/grenade/run.yaml deleted file mode 100644 index 692889ef1..000000000 --- a/playbooks/devstack/grenade/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: primary - name: job for grenade-heat - 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]] - enable_plugin heat https://opendev.org/openstack/heat - TEMPEST_PLUGINS+=' ../heat-tempest-plugin' - NOVA_ALLOW_MOVE_TO_SAME_HOST=True - 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/heat-tempest-plugin $PROJECTS" - export PYTHONUNBUFFERED=true - export GRENADE_PLUGINRC="enable_grenade_plugin heat https://opendev.org/openstack/heat" - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_GRENADE=pullup - if [ "{{ branch_override }}" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY="{{ topology }}" - export DEVSTACK_LOCAL_CONFIG=$'\n'"HOST_TOPOLOGY={{ topology }}" - 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/devstack/multinode-networking/pre.yaml b/playbooks/devstack/multinode-networking/pre.yaml deleted file mode 100644 index 3d29085c2..000000000 --- a/playbooks/devstack/multinode-networking/pre.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - multi-node-firewall |