Browse Source

[ci] use zuul v3 native job for Rally

The patch also includes the changes made at
https://review.openstack.org/#/c/576094/ fixing some typos in the yaml
file.

Change-Id: Id3f7440e8cfa6c0a0c7d4f8232e3d111f17c0492
(cherry picked from commit fcbfedde24)
changes/21/589821/1
Andrey Kurilin 3 years ago
committed by Lucas Alvares Gomes
parent
commit
cc1d76c10a
  1. 21
      playbooks/legacy/rally-dsvm-networking-ovn/post.yaml
  2. 65
      playbooks/legacy/rally-dsvm-networking-ovn/run.yaml
  3. 11
      zuul.d/legacy-networking-ovn-jobs.yaml
  4. 28
      zuul.d/networkin-ovn-rally-task.yaml
  5. 4
      zuul.d/project.yaml

21
playbooks/legacy/rally-dsvm-networking-ovn/post.yaml

@ -1,21 +0,0 @@
- hosts: primary
tasks:
- name: Copy rally 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=**/*nose_results.html
- --include=**/*testr_results.html.gz
- --include=/.testrepository/tmp*
- --include=**/*testrepository.subunit.gz
- --include=/.tox/*/log/*
- --include=/rally-plot/**
- --exclude=*
- --prune-empty-dirs
- include: ../tempest-post-common.yml

65
playbooks/legacy/rally-dsvm-networking-ovn/run.yaml

@ -1,65 +0,0 @@
- hosts: all
name: Autoconverted job legacy-rally-dsvm-networking-ovn from old job gate-rally-dsvm-networking-ovn
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 networking-ovn git://git.openstack.org/openstack/networking-ovn
enable_plugin rally git://git.openstack.org/openstack/rally
EOF
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_NEUTRON=1
export RALLY_SCENARIO=ovn
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/networking-ovn $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-ovn/devstack/devstackgaterc
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 }}'

11
zuul.d/legacy-networking-ovn-jobs.yaml

@ -76,17 +76,6 @@
- openstack-infra/devstack-gate
- openstack/networking-ovn
- job:
name: networking-ovn-rally-dsvm
parent: legacy-networking-ovn-dsvm-base
run: playbooks/legacy/rally-dsvm-networking-ovn/run.yaml
post-run: playbooks/legacy/rally-dsvm-networking-ovn/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
- openstack/networking-ovn
- openstack/rally
- job:
name: networking-ovn-tempest-dsvm-multinode
parent: legacy-networking-ovn-dsvm-base-multinode

28
zuul.d/networkin-ovn-rally-task.yaml

@ -0,0 +1,28 @@
- job:
name: networking-ovn-rally-task
parent: rally-task-at-devstack
required-projects:
- name: openstack-dev/devstack
- name: openstack-infra/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/networking-ovn
vars:
devstack_plugins:
rally-openstack: https://git.openstack.org/openstack/rally-openstack
networking-ovn: https://git.openstack.org/openstack/networking-ovn
devstack_services:
ovn-northd: true
ovn-controller: true
networking-ovn-metadata-agent: true
br-ex-tcpdump: true
br-int-flows: true
q-dhcp: false
q-l3: false
devstack_localrc:
PHYSICAL_NETWORK: public
Q_USE_PROVIDERNET_FOR_PUBLIC: true
ENABLE_CHASSIS_AS_GW: true
OVN_L3_CREATE_PUBLIC_NETWORK: true
rally_task: rally-jobs/ovn.yaml
timeout: 7800

4
zuul.d/project.yaml

@ -4,7 +4,7 @@
- networking-ovn-tempest-dsvm-ovs-master:
voting: false
- networking-ovn-tempest-dsvm-ovs-release
- networking-ovn-rally-dsvm
- networking-ovn-rally-task
- networking-ovn-dsvm-functional
- networking-ovn-dsvm-functional-py35:
branches: ^(?!stable/newton).*$
@ -24,7 +24,7 @@
gate:
jobs:
- networking-ovn-tempest-dsvm-ovs-release
- networking-ovn-rally-dsvm
- networking-ovn-rally-task
- networking-ovn-dsvm-functional
- networking-ovn-dsvm-functional-py35:
branches: ^(?!stable/newton).*$

Loading…
Cancel
Save