[CI] Convert rally jobs to zuulv3 native

The old/legacy job depends on components
from OpenStack infra that are not maintained
any longer.

Depends-On: I6b1d0e97ecdf9a2befa2a052a1743916d662d136
Change-Id: I143b78a8abf7ce714a574adef1698affd5956b1b
This commit is contained in:
Goutham Pacha Ravi 2019-07-19 17:57:08 -07:00
parent 19d169e083
commit 8cb70952e3
5 changed files with 19 additions and 298 deletions

View File

@ -31,9 +31,9 @@
- manila-tempest-minimal-dsvm-lvm
- manila-grenade:
voting: false
- manila-rally-multibackend:
- manila-rally-no-ss:
voting: false
- manila-rally-multibackend-no-ss:
- manila-rally-ss:
voting: false
- openstack-tox-pylint:
voting: false
@ -60,7 +60,7 @@
name: manila-tempest-base
parent: legacy-dsvm-base
timeout: 7200
irrelevant-files:
irrelevant-files: &tempest-irrelevant-files
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^api-ref/.*$
@ -377,45 +377,23 @@
tox_envlist: genconfig
- job:
name: manila-rally-multibackend
parent: legacy-dsvm-base
run: playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml
post-run: playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
timeout: 4200
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^manila/hacking/.*$
- ^manila/tests/.*$
- ^releasenotes/.*$
- ^tools/.*$
- ^tox.ini$
name: manila-rally-no-ss
parent: rally-task-manila-no-ss
irrelevant-files: *tempest-irrelevant-files
vars:
rally_task: rally-jobs/rally-manila-no-ss.yaml
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
required-projects:
- openstack/devstack-gate
- openstack/manila
- openstack/python-manilaclient
- openstack/rally
- openstack/manila-tempest-plugin
- openstack/rally-openstack
- job:
name: manila-rally-multibackend-no-ss
parent: legacy-dsvm-base
run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
post-run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
timeout: 4200
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^manila/hacking/.*$
- ^manila/tests/.*$
- ^releasenotes/.*$
- ^tools/.*$
- ^tox.ini$
name: manila-rally-ss
parent: rally-task-manila-ss
irrelevant-files: *tempest-irrelevant-files
vars:
rally_task: rally-jobs/rally-manila.yaml
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
required-projects:
- openstack/devstack-gate
- openstack/manila
- openstack/python-manilaclient
- openstack/rally
- openstack/manila-tempest-plugin
- openstack/rally-openstack

View File

@ -1,41 +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
- 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=/rally-plot/**
- --include=*/
- --exclude=*
- --prune-empty-dirs
- 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=/rally-plot/extra/index.html
- --include=*/
- --exclude=*
- --prune-empty-dirs

View File

@ -1,88 +0,0 @@
- hosts: all
name: Autoconverted job rally-dsvm-manila-multibackend-no-ss from old job
gate-rally-dsvm-manila-multibackend-no-ss
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 manila https://opendev.org/openstack/manila
enable_plugin rally https://opendev.org/openstack/rally
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
fi
export PROJECTS="openstack/rally openstack/manila-tempest-plugin $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Run only manila services, because only main manila functionality
# will be tested with 'dummy' share driver that does not use real
# storage back ends. Also, it will speed up devstack installation.
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
export IDENTITY_API_VERSION=3
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0
export RALLY_SCENARIO=rally-manila-no-ss
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Install manila-devstack integration
# 'dhss' means 'drivers handle share servers'
# 'driver' is codename of shar driver in manila
# that is used for proper configuration of storage backend.
source $BASE/new/manila/contrib/ci/pre_test_hook.sh 0 dummy 'multibackend'
}
export -f pre_test_hook
function post_test_hook {
source $BASE/new/manila/contrib/ci/common.sh
manila_wait_for_drivers_init /etc/manila/manila.conf
$BASE/new/rally/tests/ci/rally-gate.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,41 +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
- 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=/rally-plot/**
- --include=*/
- --exclude=*
- --prune-empty-dirs
- 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=/rally-plot/extra/index.html
- --include=*/
- --exclude=*
- --prune-empty-dirs

View File

@ -1,87 +0,0 @@
- hosts: all
name: Autoconverted job rally-dsvm-manila-multibackend from old job gate-rally-dsvm-manila-multibackend
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 manila https://opendev.org/openstack/manila
enable_plugin rally https://opendev.org/openstack/rally
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
fi
export PROJECTS="openstack/rally openstack/manila-tempest-plugin $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Run only manila services, because only main manila functionality
# will be tested with 'dummy' share driver that does not use real
# storage back ends. Also, it will speed up devstack installation.
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
export IDENTITY_API_VERSION=3
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0
export RALLY_SCENARIO=rally-manila
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Install manila-devstack integration
# 'dhss' means 'drivers handle share servers'
# 'driver' is codename of shar driver in manila
# that is used for proper configuration of storage backend.
source $BASE/new/manila/contrib/ci/pre_test_hook.sh 1 dummy 'multibackend'
}
export -f pre_test_hook
function post_test_hook {
source $BASE/new/manila/contrib/ci/common.sh
manila_wait_for_drivers_init /etc/manila/manila.conf
$BASE/new/rally/tests/ci/rally-gate.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 }}'