[ci] Use zuul v3 native job for Rally
Change-Id: I83092859778cf0d0bdb7187e7f6a8af128970717
This commit is contained in:
parent
86775a2ac5
commit
be4a610188
21
.zuul.yaml
21
.zuul.yaml
|
@ -2,7 +2,7 @@
|
|||
check:
|
||||
jobs:
|
||||
- murano-congress-devstack
|
||||
- murano-rally
|
||||
- murano-rally-task
|
||||
- murano-tempest-api
|
||||
- murano-tempest-cfapi
|
||||
- openstack-tox-lower-constraints
|
||||
|
@ -37,20 +37,15 @@
|
|||
- openstack/python-muranoclient
|
||||
|
||||
- job:
|
||||
name: murano-rally
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/rally-dsvm-murano-task/run.yaml
|
||||
post-run: playbooks/legacy/rally-dsvm-murano-task/post.yaml
|
||||
voting: false
|
||||
name: murano-rally-task
|
||||
parent: rally-task-murano
|
||||
timeout: 7800
|
||||
vars:
|
||||
devstack_plugins:
|
||||
rally-openstack: https://git.openstack.org/openstack/rally-openstack
|
||||
rally_task: rally-jobs/task-murano.yaml
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/heat
|
||||
- openstack/murano
|
||||
- openstack/murano-dashboard
|
||||
- openstack/python-heatclient
|
||||
- openstack/python-muranoclient
|
||||
- openstack/rally
|
||||
- openstack/rally-openstack
|
||||
|
||||
- job:
|
||||
name: murano-tempest-api
|
||||
|
|
|
@ -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
|
|
@ -1,81 +0,0 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-rally-dsvm-murano-task from old job gate-rally-dsvm-murano-task-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-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 rally git://git.openstack.org/openstack/rally
|
||||
enable_plugin heat git://git.openstack.org/openstack/heat
|
||||
enable_plugin murano git://git.openstack.org/openstack/murano
|
||||
|
||||
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 $PROJECTS"
|
||||
export PROJECTS="openstack/murano $PROJECTS"
|
||||
export PROJECTS="openstack/murano-dashboard $PROJECTS"
|
||||
export PROJECTS="openstack/python-muranoclient $PROJECTS"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export PROJECTS="openstack/python-heatclient $PROJECTS"
|
||||
|
||||
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=0
|
||||
export DEVSTACK_GATE_EXERCISES=0
|
||||
export RALLY_SCENARIO=$ZUUL_SHORT_PROJECT_NAME-murano
|
||||
|
||||
export IDENTITY_API_VERSION=3
|
||||
|
||||
export ENABLED_SERVICES
|
||||
|
||||
function pre_test_hook {
|
||||
# Install murano-devstack integration
|
||||
cd /opt/stack/new/murano/functionaltests
|
||||
./pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
$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 }}'
|
|
@ -40,7 +40,7 @@
|
|||
tenants: 2
|
||||
users_per_tenant: 2
|
||||
murano_packages:
|
||||
app_package: "/home/zuul/.rally/extra/applications/HelloReporter/io.murano.apps.HelloReporter/"
|
||||
app_package: "~/.rally/extra/applications/HelloReporter/io.murano.apps.HelloReporter/"
|
||||
roles:
|
||||
- "admin"
|
||||
sla:
|
Loading…
Reference in New Issue