Browse Source

Add native grenade zuul v3 jobs

Moved from https://review.opendev.org/#/c/639774/

Task: 40166
Change-Id: Id7f9be610e99cac9cf1f097066cc8748752d92dd
(cherry picked from commit 86fc1740c4)
changes/96/737896/4
Luigi Toscano 2 months ago
committed by Rabi Mishra
parent
commit
28ae099708
4 changed files with 17 additions and 103 deletions
  1. +17
    -25
      .zuul.yaml
  2. +0
    -14
      playbooks/devstack/grenade/post.yaml
  3. +0
    -61
      playbooks/devstack/grenade/run.yaml
  4. +0
    -3
      playbooks/devstack/multinode-networking/pre.yaml

+ 17
- 25
.zuul.yaml View File

@@ -138,37 +138,29 @@

- job:
name: grenade-heat
parent: legacy-dsvm-base
run: playbooks/devstack/grenade/run.yaml
post-run: playbooks/devstack/grenade/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:
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:


+ 0
- 14
playbooks/devstack/grenade/post.yaml View File

@@ -1,14 +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

+ 0
- 61
playbooks/devstack/grenade/run.yaml View File

@@ -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'
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
export DEVSTACK_GATE_USE_PYTHON3=True
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 }}'

+ 0
- 3
playbooks/devstack/multinode-networking/pre.yaml View File

@@ -1,3 +0,0 @@
- hosts: all
roles:
- multi-node-firewall

Loading…
Cancel
Save