Use the native Zuul v3 jobs from blazar-tempest-plugin

The new base jobs moved to that repository.

Depends-On: https://review.opendev.org/732694
Change-Id: I016d0ecf3751212fc578d30e5ba0a5cec48ac252
This commit is contained in:
Luigi Toscano 2020-06-02 16:42:03 +02:00 committed by Pierre Riteau
parent 690ab0972f
commit a2f792629c
4 changed files with 4 additions and 187 deletions

View File

@ -1,32 +1,3 @@
- job:
name: blazar-devstack-dsvm
parent: legacy-dsvm-base
irrelevant-files:
- ^.*\.rst$
- ^blazar/tests/.*$
- ^doc/.*$
- ^releasenotes/.*$
- ^test-requirements.txt$
- ^tools/.*$
- ^tox.ini$
run: playbooks/legacy/blazar-devstack-dsvm/run.yaml
post-run: playbooks/legacy/blazar-devstack-dsvm/post.yaml
timeout: 4200
required-projects:
- openstack/devstack
- openstack/devstack-gate
- openstack/blazar
- openstack/blazar-nova
- openstack/python-blazarclient
- openstack/blazar-tempest-plugin
- job:
name: blazar-devstack-dsvm-ipv6-only
parent: blazar-devstack-dsvm
run: playbooks/legacy/blazar-devstack-dsvm/run-ipv6.yaml
required-projects:
- openstack/tempest
- project:
templates:
- check-requirements
@ -37,12 +8,12 @@
- release-notes-jobs-python3
check:
jobs:
- blazar-devstack-dsvm
- blazar-devstack-dsvm-ipv6-only
- blazar-tempest-plugin-base
- blazar-tempest-plugin-ipv6-only
- openstack-tox-pylint:
voting: false
gate:
queue: blazar
jobs:
- blazar-devstack-dsvm
- blazar-devstack-dsvm-ipv6-only
- blazar-tempest-plugin-base
- blazar-tempest-plugin-ipv6-only

View File

@ -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

View File

@ -1,74 +0,0 @@
- hosts: all
name: legacy-blazar-devstack-dsvm-ipv6-only
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 blazar https://opendev.org/openstack/blazar
# Swift is not ready for python3 yet
disable_service s-account
disable_service s-container
disable_service s-object
disable_service s-proxy
# Without Swift, c-bak cannot run (in the Gate at least)
disable_service c-bak
# Enable Tempest plugin
TEMPEST_PLUGINS='/opt/stack/new/blazar-tempest-plugin'
SERVICE_IP_VERSION=6
SERVICE_HOST=""
# IPv6 and certificates known issue with python2
# https://bugs.launchpad.net/devstack/+bug/1794929
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
export DEVSTACK_GATE_USE_PYTHON3=True
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export ENABLED_SERVICES=blazar,blazar-a,blazar-m,tempest
export PROJECTS="openstack/blazar $PROJECTS"
export PROJECTS="openstack/blazar-nova $PROJECTS"
export PROJECTS="openstack/python-blazarclient $PROJECTS"
export PROJECTS="openstack/blazar-tempest-plugin $PROJECTS"
export DEVSTACK_GATE_TEMPEST_REGEX="blazar_tempest_plugin"
export TEMPEST_CONCURRENCY=1
function post_test_hook {
cd $BASE/new/tempest/tools
./verify-ipv6-only-deployments.sh
}
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 }}'

View File

@ -1,65 +0,0 @@
- hosts: all
name: legacy-blazar-devstack-dsvm-py35
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 blazar https://opendev.org/openstack/blazar
# Swift is not ready for python3 yet
disable_service s-account
disable_service s-container
disable_service s-object
disable_service s-proxy
# Without Swift, c-bak cannot run (in the Gate at least)
disable_service c-bak
# Enable Tempest plugin
TEMPEST_PLUGINS='/opt/stack/new/blazar-tempest-plugin'
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
export DEVSTACK_GATE_USE_PYTHON3=True
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export ENABLED_SERVICES=blazar,blazar-a,blazar-m,tempest
export PROJECTS="openstack/blazar $PROJECTS"
export PROJECTS="openstack/blazar-nova $PROJECTS"
export PROJECTS="openstack/python-blazarclient $PROJECTS"
export PROJECTS="openstack/blazar-tempest-plugin $PROJECTS"
export DEVSTACK_GATE_TEMPEST_REGEX="blazar_tempest_plugin"
export TEMPEST_CONCURRENCY=1
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 }}'