Merge "Convert legacy zuul jobs to new format"

This commit is contained in:
Zuul 2018-11-20 17:41:56 +00:00 committed by Gerrit Code Review
commit 2afd8b498c
5 changed files with 50 additions and 162 deletions

View File

@ -1,26 +1,56 @@
- job:
name: cloudkitty-tempest-full
run: playbooks/cloudkitty-tempest-full/run.yaml
post-run: playbooks/cloudkitty-tempest-full/post.yaml
timeout: 5400
parent: legacy-dsvm-base
name: cloudkitty-devstack-install
parent: devstack
description: |
Job testing cloudkitty installation on devstack
required-projects:
- openstack-infra/devstack-gate
- openstack/cloudkitty
- openstack/cloudkitty-tempest-plugin
- openstack/python-cloudkittyclient
- name: openstack/cloudkitty
- name: openstack/python-cloudkittyclient
roles:
- zuul: openstack-infra/devstack
timeout: 5400
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
vars:
devstack_plugins:
cloudkitty: https://git.openstack.org/openstack/cloudkitty
devstack_services:
ck-api: true
ck-proc: true
horizon: false
- job:
name: cloudkitty-install
parent: legacy-dsvm-base
run: playbooks/cloudkitty-install/run.yaml
post-run: playbooks//cloudkitty-install/post.yaml
timeout: 7200
name: cloudkitty-tempest-full
parent: devstack-tempest
description: |
Job testing cloudkitty installation on devstack and running tempest tests
required-projects:
- openstack-infra/devstack-gate
- openstack/cloudkitty
- openstack/cloudkitty-dashboard
- openstack/python-cloudkittyclient
- name: openstack/cloudkitty
- name: openstack/cloudkitty-tempest-plugin
- name: openstack/python-cloudkittyclient
roles:
- zuul: openstack-infra/devstack
timeout: 5400
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
vars:
devstack_plugins:
cloudkitty: https://git.openstack.org/openstack/cloudkitty
cloudkitty-tempest-plugin: https://git.openstack.org/openstack/cloudkitty-tempest-plugin
devstack_services:
ck-api: true
ck-proc: true
horizon: false
tempest: true
tempest_concurrency: 1
tempest_test_regex: cloudkitty_tempest_plugin.*
tox_envlist: all
devstack_localrc:
TEMPEST_PLUGINS: /opt/stack/cloudkitty-tempest-plugin
- project:
templates:
@ -36,8 +66,8 @@
jobs:
- cloudkitty-tempest-full:
voting: false
- cloudkitty-install
- cloudkitty-devstack-install
gate:
queue: cloudkitty
jobs:
- cloudkitty-install
- cloudkitty-devstack-install

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,58 +0,0 @@
- hosts: all
name: Autoconverted job legacy-cloudkitty-dsvm-install from old job gate-cloudkitty-dsvm-install-ubuntu-xenial
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
cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]]
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
enable_plugin cloudkitty git://git.openstack.org/openstack/cloudkitty master
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
export PROJECTS="openstack/cloudkitty $PROJECTS"
export PROJECTS="openstack/python-cloudkittyclient $PROJECTS"
export PROJECTS="openstack/cloudkitty-dashboard $PROJECTS"
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 }}'

View File

@ -1,15 +0,0 @@
- hosts: all
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,54 +0,0 @@
- hosts: all
name: Run the whole cloudkitty-tempest-plugin test suite
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_TEMPEST_REGEX=cloudkitty_tempest_plugin
export KEEP_LOCALRC=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin cloudkitty git://git.openstack.org/openstack/cloudkitty"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service ck-api, ck-proc"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/cloudkitty-tempest-plugin'"
export PROJECTS="$PROJECTS openstack/cloudkitty"
export PROJECTS="$PROJECTS openstack/python-cloudkittyclient"
export PROJECTS="$PROJECTS openstack/cloudkitty-tempest-plugin"
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 }}'