summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-14 13:12:47 +0000
committerGerrit Code Review <review@openstack.org>2018-11-14 13:12:47 +0000
commitb52c0e90f0b00a7089532b66576923c8299687f3 (patch)
tree40c1bb01e8b4ea07ef670915dc004c70d7017b95
parent4fc6df38bcd26217350fc746745600ccc4f26bbf (diff)
parentacad34a7a84ec57ec1a13e7c89c55852ab990cd1 (diff)
Merge "Migrate tempest jobs to zuul v3 native"
-rw-r--r--playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/post.yaml4
-rw-r--r--playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/run.yaml87
-rw-r--r--playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/post.yaml4
-rw-r--r--playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/run.yaml87
-rw-r--r--playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/post.yaml4
-rw-r--r--playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/run.yaml87
-rw-r--r--zuul.d/legacy-networking-ovn-jobs.yaml39
-rw-r--r--zuul.d/networkin-ovn-jobs.yaml106
8 files changed, 106 insertions, 312 deletions
diff --git a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/post.yaml b/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/post.yaml
deleted file mode 100644
index 70d365e..0000000
--- a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/post.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - include: ../tempest-post-common.yml
diff --git a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/run.yaml b/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/run.yaml
deleted file mode 100644
index 84b2145..0000000
--- a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/run.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-networking-ovn-ovs-master from old job
3 gate-tempest-dsvm-networking-ovn-ovs-master-nv
4 tasks:
5
6 - name: Ensure legacy workspace directory
7 file:
8 path: '{{ ansible_user_dir }}/workspace'
9 state: directory
10
11 - shell:
12 cmd: |
13 set -e
14 set -x
15 cat > clonemap.yaml << EOF
16 clonemap:
17 - name: openstack-infra/devstack-gate
18 dest: devstack-gate
19 EOF
20 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21 git://git.openstack.org \
22 openstack-infra/devstack-gate
23 executable: /bin/bash
24 chdir: '{{ ansible_user_dir }}/workspace'
25 environment: '{{ zuul | zuul_legacy_vars }}'
26
27 - shell:
28 cmd: |
29 set -e
30 set -x
31 cat << 'EOF' >>"/tmp/dg-local.conf"
32 [[local|localrc]]
33 enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
34 enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin
35 enable_plugin octavia git://git.openstack.org/openstack/octavia
36 enable_service ovn-octavia
37 enable_service o-api
38 enable_service o-hk
39 OVN_DBS_LOG_LEVEL="dbg"
40 USE_PYTHON3=True
41
42 EOF
43 executable: /bin/bash
44 chdir: '{{ ansible_user_dir }}/workspace'
45 environment: '{{ zuul | zuul_legacy_vars }}'
46
47 - shell:
48 cmd: |
49 set -e
50 set -x
51 export PYTHONUNBUFFERED=true
52 export DEVSTACK_GATE_NEUTRON=1
53 export DEVSTACK_GATE_TEMPEST=1
54 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
55 export BRANCH_OVERRIDE=default
56 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
57 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
58 fi
59 # Because we are testing a non standard project, add
60 # our project repository. This makes zuul do the right
61 # reference magic for testing changes.
62 export PROJECTS="openstack/networking-ovn openstack/neutron-tempest-plugin openstack/octavia $PROJECTS"
63
64 # Keep localrc to be able to set some vars in pre_test_hook
65 export KEEP_LOCALRC=1
66
67 function pre_test_hook {
68 if [ -f $BASE/new/networking-ovn/devstack/pre_test_hook.sh ] ; then
69 . $BASE/new/networking-ovn/devstack/pre_test_hook.sh
70 fi
71 }
72 export -f pre_test_hook
73
74 function post_test_hook {
75 if [ -f $BASE/new/networking-ovn/devstack/post_test_hook.sh ] ; then
76 . $BASE/new/networking-ovn/devstack/post_test_hook.sh
77 fi
78 }
79 export -f post_test_hook
80
81 export DEVSTACK_GATE_SETTINGS="/opt/stack/new/networking-ovn/devstack/devstackgaterc master"
82
83 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
84 ./safe-devstack-vm-gate-wrap.sh
85 executable: /bin/bash
86 chdir: '{{ ansible_user_dir }}/workspace'
87 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/post.yaml b/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/post.yaml
deleted file mode 100644
index 70d365e..0000000
--- a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/post.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - include: ../tempest-post-common.yml
diff --git a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/run.yaml b/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/run.yaml
deleted file mode 100644
index ec49d5c..0000000
--- a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/run.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-networking-ovn-ovs-release-python2
3 from old job gate-tempest-dsvm-networking-ovn-ovs-release
4 tasks:
5
6 - name: Ensure legacy workspace directory
7 file:
8 path: '{{ ansible_user_dir }}/workspace'
9 state: directory
10
11 - shell:
12 cmd: |
13 set -e
14 set -x
15 cat > clonemap.yaml << EOF
16 clonemap:
17 - name: openstack-infra/devstack-gate
18 dest: devstack-gate
19 EOF
20 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21 git://git.openstack.org \
22 openstack-infra/devstack-gate
23 executable: /bin/bash
24 chdir: '{{ ansible_user_dir }}/workspace'
25 environment: '{{ zuul | zuul_legacy_vars }}'
26
27 - shell:
28 cmd: |
29 set -e
30 set -x
31 cat << 'EOF' >>"/tmp/dg-local.conf"
32 [[local|localrc]]
33 enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
34 enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin
35 enable_plugin octavia git://git.openstack.org/openstack/octavia
36 enable_service ovn-octavia
37 enable_service o-api
38 enable_service o-hk
39 OVN_DBS_LOG_LEVEL="dbg"
40 USE_PYTHON3=False
41
42 EOF
43 executable: /bin/bash
44 chdir: '{{ ansible_user_dir }}/workspace'
45 environment: '{{ zuul | zuul_legacy_vars }}'
46
47 - shell:
48 cmd: |
49 set -e
50 set -x
51 export PYTHONUNBUFFERED=true
52 export DEVSTACK_GATE_NEUTRON=1
53 export DEVSTACK_GATE_TEMPEST=1
54 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
55 export BRANCH_OVERRIDE=default
56 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
57 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
58 fi
59 # Because we are testing a non standard project, add
60 # our project repository. This makes zuul do the right
61 # reference magic for testing changes.
62 export PROJECTS="openstack/networking-ovn openstack/neutron-tempest-plugin openstack/octavia $PROJECTS"
63
64 # Keep localrc to be able to set some vars in pre_test_hook
65 export KEEP_LOCALRC=1
66
67 function pre_test_hook {
68 if [ -f $BASE/new/networking-ovn/devstack/pre_test_hook.sh ] ; then
69 . $BASE/new/networking-ovn/devstack/pre_test_hook.sh
70 fi
71 }
72 export -f pre_test_hook
73
74 function post_test_hook {
75 if [ -f $BASE/new/networking-ovn/devstack/post_test_hook.sh ] ; then
76 . $BASE/new/networking-ovn/devstack/post_test_hook.sh
77 fi
78 }
79 export -f post_test_hook
80
81 export DEVSTACK_GATE_SETTINGS="/opt/stack/new/networking-ovn/devstack/devstackgaterc latest-release"
82
83 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
84 ./safe-devstack-vm-gate-wrap.sh
85 executable: /bin/bash
86 chdir: '{{ ansible_user_dir }}/workspace'
87 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/post.yaml b/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/post.yaml
deleted file mode 100644
index 70d365e..0000000
--- a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/post.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - include: ../tempest-post-common.yml
diff --git a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/run.yaml b/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/run.yaml
deleted file mode 100644
index 6e34eec..0000000
--- a/playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/run.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-networking-ovn-ovs-release
3 from old job gate-tempest-dsvm-networking-ovn-ovs-release
4 tasks:
5
6 - name: Ensure legacy workspace directory
7 file:
8 path: '{{ ansible_user_dir }}/workspace'
9 state: directory
10
11 - shell:
12 cmd: |
13 set -e
14 set -x
15 cat > clonemap.yaml << EOF
16 clonemap:
17 - name: openstack-infra/devstack-gate
18 dest: devstack-gate
19 EOF
20 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21 git://git.openstack.org \
22 openstack-infra/devstack-gate
23 executable: /bin/bash
24 chdir: '{{ ansible_user_dir }}/workspace'
25 environment: '{{ zuul | zuul_legacy_vars }}'
26
27 - shell:
28 cmd: |
29 set -e
30 set -x
31 cat << 'EOF' >>"/tmp/dg-local.conf"
32 [[local|localrc]]
33 enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
34 enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin
35 enable_plugin octavia git://git.openstack.org/openstack/octavia
36 enable_service ovn-octavia
37 enable_service o-api
38 enable_service o-hk
39 OVN_DBS_LOG_LEVEL="dbg"
40 USE_PYTHON3=True
41
42 EOF
43 executable: /bin/bash
44 chdir: '{{ ansible_user_dir }}/workspace'
45 environment: '{{ zuul | zuul_legacy_vars }}'
46
47 - shell:
48 cmd: |
49 set -e
50 set -x
51 export PYTHONUNBUFFERED=true
52 export DEVSTACK_GATE_NEUTRON=1
53 export DEVSTACK_GATE_TEMPEST=1
54 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
55 export BRANCH_OVERRIDE=default
56 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
57 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
58 fi
59 # Because we are testing a non standard project, add
60 # our project repository. This makes zuul do the right
61 # reference magic for testing changes.
62 export PROJECTS="openstack/networking-ovn openstack/neutron-tempest-plugin openstack/octavia $PROJECTS"
63
64 # Keep localrc to be able to set some vars in pre_test_hook
65 export KEEP_LOCALRC=1
66
67 function pre_test_hook {
68 if [ -f $BASE/new/networking-ovn/devstack/pre_test_hook.sh ] ; then
69 . $BASE/new/networking-ovn/devstack/pre_test_hook.sh
70 fi
71 }
72 export -f pre_test_hook
73
74 function post_test_hook {
75 if [ -f $BASE/new/networking-ovn/devstack/post_test_hook.sh ] ; then
76 . $BASE/new/networking-ovn/devstack/post_test_hook.sh
77 fi
78 }
79 export -f post_test_hook
80
81 export DEVSTACK_GATE_SETTINGS="/opt/stack/new/networking-ovn/devstack/devstackgaterc latest-release"
82
83 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
84 ./safe-devstack-vm-gate-wrap.sh
85 executable: /bin/bash
86 chdir: '{{ ansible_user_dir }}/workspace'
87 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/legacy-networking-ovn-jobs.yaml b/zuul.d/legacy-networking-ovn-jobs.yaml
index b5ab078..ad54ff3 100644
--- a/zuul.d/legacy-networking-ovn-jobs.yaml
+++ b/zuul.d/legacy-networking-ovn-jobs.yaml
@@ -68,45 +68,6 @@
68 nodeset: legacy-ubuntu-xenial-2-node 68 nodeset: legacy-ubuntu-xenial-2-node
69 69
70- job: 70- job:
71 name: networking-ovn-tempest-dsvm-ovs-master
72 parent: legacy-networking-ovn-dsvm-base
73 run: playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/run.yaml
74 post-run: playbooks/legacy/tempest-dsvm-networking-ovn-ovs-master/post.yaml
75 timeout: 7800
76 required-projects:
77 - openstack-infra/devstack-gate
78 - openstack/networking-ovn
79 - openstack/neutron-tempest-plugin
80 - openstack/octavia
81 - openstack/tempest
82
83- job:
84 name: networking-ovn-tempest-dsvm-ovs-release
85 parent: legacy-networking-ovn-dsvm-base
86 run: playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/run.yaml
87 post-run: playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release/post.yaml
88 timeout: 7800
89 required-projects:
90 - openstack-infra/devstack-gate
91 - openstack/networking-ovn
92 - openstack/neutron-tempest-plugin
93 - openstack/octavia
94 - openstack/tempest
95
96- job:
97 name: networking-ovn-tempest-dsvm-ovs-release-python2
98 parent: legacy-networking-ovn-dsvm-base
99 run: playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/run.yaml
100 post-run: playbooks/legacy/tempest-dsvm-networking-ovn-ovs-release-python2/post.yaml
101 timeout: 7800
102 required-projects:
103 - openstack-infra/devstack-gate
104 - openstack/networking-ovn
105 - openstack/neutron-tempest-plugin
106 - openstack/octavia
107 - openstack/tempest
108
109- job:
110 name: networking-ovn-dsvm-grenade 71 name: networking-ovn-dsvm-grenade
111 parent: legacy-networking-ovn-dsvm-base 72 parent: legacy-networking-ovn-dsvm-base
112 run: playbooks/legacy/grenade-dsvm-networking-ovn/run.yaml 73 run: playbooks/legacy/grenade-dsvm-networking-ovn/run.yaml
diff --git a/zuul.d/networkin-ovn-jobs.yaml b/zuul.d/networkin-ovn-jobs.yaml
new file mode 100644
index 0000000..4b6a678
--- /dev/null
+++ b/zuul.d/networkin-ovn-jobs.yaml
@@ -0,0 +1,106 @@
1- job:
2 name: networking-ovn-base
3 description: Base job for devstack/tempest based networking-ovn jobs.
4 parent: devstack-tempest
5 timeout: 10800
6 required-projects:
7 - openstack-infra/devstack-gate
8 - openstack/networking-ovn
9 - openstack/neutron
10 - openstack/neutron-tempest-plugin
11 - openstack/octavia
12 - openstack/tempest
13 irrelevant-files:
14 - ^(test-|)requirements.txt$
15 - ^.*\.rst$
16 - ^doc/.*$
17 - ^releasenotes/.*$
18 - ^setup.cfg$
19 - ^tools/.*$
20 - ^tox.ini$
21 - ^vagrant/.*$
22 vars:
23 tox_envlist: all-plugin
24 tempest_test_regex: "^(?!.*(?:.*\\[.*slow.*\\])|(?:tempest.api.network.admin.test_quotas.QuotasTest.test_lbaas_quotas.*)|(?:tempest.api.network.test_load_balancer.*)|(?:tempest.scenario.test_load_balancer.*)|(?:tempest.api.network.admin.test_load_balancer.*)|(?:tempest.api.network.admin.test_lbaas.*)|(?:tempest.api.network.test_fwaas_extensions.*)|(?:tempest.api.network.test_metering_extensions.*)|(?:tempest.thirdparty.boto.test_s3.*)|(?:tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_port_security_macspoofing_port)|(?:tempest.api.identity*)|(?:tempest.api.image*)|(?:tempest.api.volume*)|(?:tempest.api.compute.images*)|(?:tempest.api.compute.keypairs*)|(?:tempest.api.compute.certificates*)|(?:tempest.api.compute.flavors*)|(?:tempest.api.compute.test_quotas*)|(?:tempest.api.compute.test_versions*)|(?:tempest.api.compute.volumes*)|(?:tempest.api.compute.admin.test_flavor*)|(?:tempest.api.compute.admin.test_volume*)|(?:tempest.api.compute.admin.test_hypervisor*)|(?:tempest.api.compute.admin.test_aggregate*)|(?:tempest.api.compute.admin.test_quota*)|(?:tempest.scenario.test_volume*))((^neutron_tempest_plugin.api)|(^neutron_tempest_plugin.scenario)|(tempest.(api|scenario|thirdparty))).*$"
25 tempest_concurrency: 2
26 devstack_localrc:
27 Q_USE_PROVIDERNET_FOR_PUBLIC: true
28 PHYSICAL_NETWORK: public
29 ENABLE_CHASSIS_AS_GW: true
30 OVN_L3_CREATE_PUBLIC_NETWORK: true
31 OVN_DBS_LOG_LEVEL: dbg
32 USE_PYTHON3: True
33 devstack_plugins:
34 networking-ovn: https://git.openstack.org/openstack/networking-ovn
35 neutron-tempest-plugin: https://git.openstack.org/openstack/neutron-tempest-plugin
36 octavia: https://git.openstack.org/openstack/octavia
37 zuul_copy_output:
38 '{{ devstack_base_dir }}/data/ovs': 'logs'
39 extensions_to_txt:
40 db: true
41 devstack_services:
42 br-ex-tcpdump: true
43 br-int-flows: true
44 c-api: true
45 c-sch: true
46 c-vol: true
47 dstat: true
48 g-api: true
49 g-reg: true
50 keystone: true
51 n-api-meta: true
52 n-api: true
53 n-cauth: true
54 n-cond-cell1: true
55 n-cpu: true
56 n-novnc-cell1: true
57 n-sch: true
58 n-super-cond: true
59 networking-ovn-metadata-agent: true
60 o-api: true
61 o-hk: true
62 ovn-controller: true
63 ovn-northd: true
64 ovn-octavia: true
65 ovs-vswitchd: true
66 ovsdb-server: true
67 placement-api: true
68 q-svc: true
69 c-bak: false
70 etcd: false
71 peakmem_tracker: false
72 q-agt: false
73 q-dhcp: false
74 q-l3: false
75 q-meta: false
76 q-metering: false
77 s-account: false
78 s-container-sync: false
79 s-container: false
80 s-object: false
81 s-proxy: false
82
83- job:
84 name: networking-ovn-tempest-dsvm-ovs-master
85 description: Job testing for devstack/tempest testing networking-ovn with OVN master branch
86 parent: networking-ovn-base
87 vars:
88 devstack_localrc:
89 OVN_BRANCH: master
90
91- job:
92 name: networking-ovn-tempest-dsvm-ovs-release
93 description: Job testing for devstack/tempest testing networking-ovn with the latest released OVN branch
94 parent: networking-ovn-base
95 vars:
96 devstack_localrc:
97 OVN_BRANCH: branch-2.10
98
99- job:
100 name: networking-ovn-tempest-dsvm-ovs-release-python2
101 description: Job testing for devstack/tempest testing networking-ovn with the latest released OVN branch
102 parent: networking-ovn-base
103 vars:
104 devstack_localrc:
105 OVN_BRANCH: branch-2.10
106 USE_PYTHON3: False