Migrate tempest-dsvm-cells job to an in-tree job definition

This defines the nova-cells-v1 job, based the tempest-dsvm-cells
job from openstack-zuul-jobs.

The branch override parts of the job definition are removed since
the job will be defined per-branch now (we'll also have to backport
this to stable/queens).

There will be related changes to project-config, devstack, tempest
and openstack-zuul-jobs on this topic branch to use the new job name.

Part of blueprint remove-nova-network

Conflicts:
      .zuul.yaml

NOTE(mriedem): The conflict is due to change
I8630ea11c3067ed934de2ef27a63432418e98c33 not being in Queens.

Change-Id: I25c87f27c69e0cdb74e8553305a09cb85f43d87e
(cherry picked from commit 6435b3745a)
This commit is contained in:
Matt Riedemann 2018-03-05 09:56:30 -05:00
parent 0390d5f0ce
commit f9d5fd5f44
3 changed files with 66 additions and 0 deletions

View File

@ -62,6 +62,12 @@
tox_envlist: functional-py35
timeout: 3600
- job:
name: nova-cells-v1
parent: nova-dsvm-base
run: playbooks/legacy/nova-cells-v1/run.yaml
post-run: playbooks/legacy/nova-cells-v1/post.yaml
- job:
name: nova-lvm
parent: nova-dsvm-base
@ -90,11 +96,13 @@
# Please try to keep the list of job names sorted alphabetically.
check:
jobs:
- nova-cells-v1
- nova-multiattach
- nova-tox-functional
- nova-tox-functional-py35
gate:
jobs:
- nova-cells-v1
- nova-multiattach
- nova-tox-functional
- nova-tox-functional-py35

View File

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

@ -0,0 +1,43 @@
- hosts: all
name: nova-cells-v1
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-infra/devstack-gate
dest: devstack-gate
EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
git://git.openstack.org \
openstack-infra/devstack-gate
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_CELLS=1
# NOTE(mriedem): Explicitly tell devstack-gate that we need to run
# the cells v1 job with nova-network.
export DEVSTACK_GATE_NEUTRON=0
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-cells-rc
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 }}'