zuul: native Zuul v3 version of the grenade job

Also fix the name according the guidelines.
This job should really live inside neutron-lib.

Change-Id: I76043ea43efe1c78ba9637876ed6a8b997b6d0ee
This commit is contained in:
Luigi Toscano 2020-08-10 16:25:36 +02:00
parent 873e08597f
commit 097106d8fb
3 changed files with 13 additions and 81 deletions

View File

@ -16,7 +16,7 @@
- neutronclient-functional
experimental:
jobs:
- neutron-lib-grenade-dsvm:
- neutronclient-grenade-neutron-lib:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
@ -45,15 +45,19 @@
neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas
- job:
name: neutron-lib-grenade-dsvm
# Old name: legacy-grenade-dsvm-neutron-libs
parent: legacy-dsvm-base
run: playbooks/legacy/grenade-dsvm-neutron-libs/run.yaml
post-run: playbooks/legacy/grenade-dsvm-neutron-libs/post.yaml
timeout: 10800
name: neutronclient-grenade-neutron-lib
parent: grenade
description: |
neutron-lib grenade job.
The version of this job on the current branch is py3 based,
while any branch before ussuri needs to use the py2 version,
which is defined in openstack-zuul-jobs with the old name
(legacy-grenade-dsvm-neutron-libs).
Users of this job needs to pay attention of the version used.
Former names for this job were:
* legacy-grenade-dsvm-neutron-libs
* neutron-lib-grenade-dsvm
required-projects:
- openstack/grenade
- openstack/devstack-gate
- openstack/keystoneauth
- openstack/neutron
- openstack/neutron-lib
@ -64,8 +68,3 @@
- openstack/python-keystoneclient
- openstack/python-neutronclient
- openstack/python-novaclient
# This is py3 version for ussuri onwards rest all branch needs to be py2
# version which is present in openstack-zuul-jobs.
# We need to take care of this branch variant and python version while
# migrating these jobs to zuulv3.
branches: ^(?!(stable/(ocata|pike|queens|rocky|stein|train))).*$

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,52 +0,0 @@
- hosts: all
name: Autoconverted job legacy-grenade-dsvm-neutron-libs from old job gate-grenade-dsvm-neutron-libs-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
export PROJECTS="openstack/grenade $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="os-client-config"
export DEVSTACK_PROJECT_FROM_GIT+=",keystoneauth"
export DEVSTACK_PROJECT_FROM_GIT+=",python-novaclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-keystoneclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-glanceclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-cinderclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-neutronclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-ironicclient"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_USE_PYTHON3=True
export DEVSTACK_GATE_NEUTRON=1
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 }}'