瀏覽代碼

Merge "[ci] Use zuul v3 native job for Rally"

tags/2.0.0
Zuul 1 年之前
父節點
當前提交
59f258a4ad

+ 10
- 6
.zuul.yaml 查看文件

@@ -15,18 +15,22 @@

- job:
name: kuryr-libnetwork-rally-base
parent: legacy-dsvm-base
run: playbooks/kuryr-libnetwork-rally-base/run.yaml
post-run: playbooks/kuryr-libnetwork-rally-base/post.yaml
parent: rally-task-at-devstack
timeout: 7800
vars:
use_src: 0
devstack_plugins:
rally-openstack: https://git.openstack.org/openstack/rally-openstack
kuryr-libnetwork: http://git.openstack.org/openstack/kuryr-libnetwork
devstack-plugin-container: https://github.com/openstack/devstack-plugin-container
devstack_local_config:
KURYR_CONFIG_DIR: "/etc/kuryr-libnetwork"
rally_task: rally-jobs/kuryr-libnetwork.yaml
required-projects:
- openstack-infra/devstack-gate
- openstack/devstack-plugin-container
- openstack/rally-openstack
- openstack/kuryr
- openstack/kuryr-libnetwork
- openstack/rally
- openstack/devstack-plugin-container
voting: false

- job:

+ 0
- 106
playbooks/kuryr-libnetwork-rally-base/post.yaml 查看文件

@@ -1,106 +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=**/*nose_results.html
- --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=**/*testr_results.html.gz
- --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=/.testrepository/tmp*
- --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=**/*testrepository.subunit.gz
- --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 }}/tox'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/.tox/*/log/*
- --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=/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

+ 0
- 74
playbooks/kuryr-libnetwork-rally-base/run.yaml 查看文件

@@ -1,74 +0,0 @@
- hosts: all
name: Autoconverted job legacy-kuryr-libnetwork-dsvm-rally from old job gate-kuryr-libnetwork-dsvm-rally-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 kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
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=kuryr-libnetwork
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS"
export PROJECTS="openstack/devstack-plugin-container $PROJECTS"

if [ "{{ use_src }}" -e 1 ] ; then
export DEVSTACK_PROJECT_FROM_GIT="kuryr"
fi


function gate_hook {
bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh
}
export -f gate_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 }}'

+ 1
- 1
rally-jobs/plugins/scenarios/kuryr.py 查看文件

@@ -16,7 +16,7 @@
import docker
import utils

from rally.plugins.openstack import scenario
from rally_openstack import scenario


@scenario.configure(name="Kuryr.list_networks")

+ 1
- 1
rally-jobs/plugins/scenarios/utils.py 查看文件

@@ -14,8 +14,8 @@
# under the License.

from rally.common import logging
from rally.plugins.openstack import scenario
from rally.task import atomic
from rally_openstack import scenario

LOG = logging.getLogger(__name__)


Loading…
取消
儲存