summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-05 11:52:52 +0000
committerGerrit Code Review <review@openstack.org>2018-06-05 11:52:52 +0000
commit59f258a4ad471cdf4df45de0787b8f7357c36ed0 (patch)
treef1ed1d8c80135bdf3add8fd50c23931ddc55e4cf
parent42b0c306a05d08f0ecc52a41fb40acddbdb7bb75 (diff)
parentbf416eedcf6479f1212458575e9a46e4d1febd49 (diff)
Merge "[ci] Use zuul v3 native job for Rally"
-rw-r--r--.zuul.yaml16
-rw-r--r--playbooks/kuryr-libnetwork-rally-base/post.yaml106
-rw-r--r--playbooks/kuryr-libnetwork-rally-base/run.yaml74
-rw-r--r--rally-jobs/plugins/scenarios/kuryr.py2
-rw-r--r--rally-jobs/plugins/scenarios/utils.py2
5 files changed, 12 insertions, 188 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 19cf158..e07b9fd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,18 +15,22 @@
15 15
16- job: 16- job:
17 name: kuryr-libnetwork-rally-base 17 name: kuryr-libnetwork-rally-base
18 parent: legacy-dsvm-base 18 parent: rally-task-at-devstack
19 run: playbooks/kuryr-libnetwork-rally-base/run.yaml
20 post-run: playbooks/kuryr-libnetwork-rally-base/post.yaml
21 timeout: 7800 19 timeout: 7800
22 vars: 20 vars:
23 use_src: 0 21 use_src: 0
22 devstack_plugins:
23 rally-openstack: https://git.openstack.org/openstack/rally-openstack
24 kuryr-libnetwork: http://git.openstack.org/openstack/kuryr-libnetwork
25 devstack-plugin-container: https://github.com/openstack/devstack-plugin-container
26 devstack_local_config:
27 KURYR_CONFIG_DIR: "/etc/kuryr-libnetwork"
28 rally_task: rally-jobs/kuryr-libnetwork.yaml
24 required-projects: 29 required-projects:
25 - openstack-infra/devstack-gate 30 - openstack/rally-openstack
26 - openstack/devstack-plugin-container
27 - openstack/kuryr 31 - openstack/kuryr
28 - openstack/kuryr-libnetwork 32 - openstack/kuryr-libnetwork
29 - openstack/rally 33 - openstack/devstack-plugin-container
30 voting: false 34 voting: false
31 35
32- job: 36- job:
diff --git a/playbooks/kuryr-libnetwork-rally-base/post.yaml b/playbooks/kuryr-libnetwork-rally-base/post.yaml
deleted file mode 100644
index 46ded30..0000000
--- a/playbooks/kuryr-libnetwork-rally-base/post.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5 synchronize:
6 src: '{{ ansible_user_dir }}/workspace/'
7 dest: '{{ zuul.executor.log_root }}'
8 mode: pull
9 copy_links: true
10 verify_host: true
11 rsync_opts:
12 - --include=**/*nose_results.html
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
16
17 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
18 synchronize:
19 src: '{{ ansible_user_dir }}/workspace/'
20 dest: '{{ zuul.executor.log_root }}'
21 mode: pull
22 copy_links: true
23 verify_host: true
24 rsync_opts:
25 - --include=**/*testr_results.html.gz
26 - --include=*/
27 - --exclude=*
28 - --prune-empty-dirs
29
30 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
31 synchronize:
32 src: '{{ ansible_user_dir }}/workspace/'
33 dest: '{{ zuul.executor.log_root }}'
34 mode: pull
35 copy_links: true
36 verify_host: true
37 rsync_opts:
38 - --include=/.testrepository/tmp*
39 - --include=*/
40 - --exclude=*
41 - --prune-empty-dirs
42
43 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
44 synchronize:
45 src: '{{ ansible_user_dir }}/workspace/'
46 dest: '{{ zuul.executor.log_root }}'
47 mode: pull
48 copy_links: true
49 verify_host: true
50 rsync_opts:
51 - --include=**/*testrepository.subunit.gz
52 - --include=*/
53 - --exclude=*
54 - --prune-empty-dirs
55
56 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
57 synchronize:
58 src: '{{ ansible_user_dir }}/workspace/'
59 dest: '{{ zuul.executor.log_root }}/tox'
60 mode: pull
61 copy_links: true
62 verify_host: true
63 rsync_opts:
64 - --include=/.tox/*/log/*
65 - --include=*/
66 - --exclude=*
67 - --prune-empty-dirs
68
69 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
70 synchronize:
71 src: '{{ ansible_user_dir }}/workspace/'
72 dest: '{{ zuul.executor.log_root }}'
73 mode: pull
74 copy_links: true
75 verify_host: true
76 rsync_opts:
77 - --include=/logs/**
78 - --include=*/
79 - --exclude=*
80 - --prune-empty-dirs
81
82 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
83 synchronize:
84 src: '{{ ansible_user_dir }}/workspace/'
85 dest: '{{ zuul.executor.log_root }}'
86 mode: pull
87 copy_links: true
88 verify_host: true
89 rsync_opts:
90 - --include=/rally-plot/**
91 - --include=*/
92 - --exclude=*
93 - --prune-empty-dirs
94
95 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
96 synchronize:
97 src: '{{ ansible_user_dir }}/workspace/'
98 dest: '{{ zuul.executor.log_root }}'
99 mode: pull
100 copy_links: true
101 verify_host: true
102 rsync_opts:
103 - --include=/rally-plot/extra/index.html
104 - --include=*/
105 - --exclude=*
106 - --prune-empty-dirs
diff --git a/playbooks/kuryr-libnetwork-rally-base/run.yaml b/playbooks/kuryr-libnetwork-rally-base/run.yaml
deleted file mode 100644
index 7569647..0000000
--- a/playbooks/kuryr-libnetwork-rally-base/run.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-kuryr-libnetwork-dsvm-rally from old job gate-kuryr-libnetwork-dsvm-rally-ubuntu-xenial-nv
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 set -e
13 set -x
14 cat > clonemap.yaml << EOF
15 clonemap:
16 - name: openstack-infra/devstack-gate
17 dest: devstack-gate
18 EOF
19 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
20 git://git.openstack.org \
21 openstack-infra/devstack-gate
22 executable: /bin/bash
23 chdir: '{{ ansible_user_dir }}/workspace'
24 environment: '{{ zuul | zuul_legacy_vars }}'
25
26 - shell:
27 cmd: |
28 set -e
29 set -x
30 cat << 'EOF' >>"/tmp/dg-local.conf"
31 [[local|localrc]]
32 enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
33 enable_plugin rally git://git.openstack.org/openstack/rally
34
35 EOF
36 executable: /bin/bash
37 chdir: '{{ ansible_user_dir }}/workspace'
38 environment: '{{ zuul | zuul_legacy_vars }}'
39
40 - shell:
41 cmd: |
42 set -e
43 set -x
44 export PYTHONUNBUFFERED=true
45 export DEVSTACK_GATE_NEUTRON=1
46 export RALLY_SCENARIO=kuryr-libnetwork
47 export BRANCH_OVERRIDE=default
48 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
49 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
50 fi
51 export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
52 export PROJECTS="openstack/rally $PROJECTS"
53 export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
54
55 if [ "{{ use_src }}" -e 1 ] ; then
56 export DEVSTACK_PROJECT_FROM_GIT="kuryr"
57 fi
58
59
60 function gate_hook {
61 bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh
62 }
63 export -f gate_hook
64
65 function post_test_hook {
66 $BASE/new/rally/tests/ci/rally-gate.sh
67 }
68 export -f post_test_hook
69
70 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
71 ./safe-devstack-vm-gate-wrap.sh
72 executable: /bin/bash
73 chdir: '{{ ansible_user_dir }}/workspace'
74 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/rally-jobs/plugins/scenarios/kuryr.py b/rally-jobs/plugins/scenarios/kuryr.py
index f7652e6..31fa009 100644
--- a/rally-jobs/plugins/scenarios/kuryr.py
+++ b/rally-jobs/plugins/scenarios/kuryr.py
@@ -16,7 +16,7 @@
16import docker 16import docker
17import utils 17import utils
18 18
19from rally.plugins.openstack import scenario 19from rally_openstack import scenario
20 20
21 21
22@scenario.configure(name="Kuryr.list_networks") 22@scenario.configure(name="Kuryr.list_networks")
diff --git a/rally-jobs/plugins/scenarios/utils.py b/rally-jobs/plugins/scenarios/utils.py
index aa4c51e..0bfdd95 100644
--- a/rally-jobs/plugins/scenarios/utils.py
+++ b/rally-jobs/plugins/scenarios/utils.py
@@ -14,8 +14,8 @@
14# under the License. 14# under the License.
15 15
16from rally.common import logging 16from rally.common import logging
17from rally.plugins.openstack import scenario
18from rally.task import atomic 17from rally.task import atomic
18from rally_openstack import scenario
19 19
20LOG = logging.getLogger(__name__) 20LOG = logging.getLogger(__name__)
21 21