summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2018-10-26 11:05:32 -0700
committerIury Gregory Melo Ferreira <imelofer@redhat.com>2018-12-14 14:39:24 +0100
commit7636cac1f624ebff5ec8c221b5b03d701ea623e0 (patch)
tree7e5f523ccfeb5a389cc0f2d0d5c55d3c9d8d6676
parent59cf11bee6647f7c24a8ee7ca7750e8cedec19c2 (diff)
Migrate n-g-s jobs to Zuulv3
Sets up jobs for Zuulv3, and marks the python3 jobs as n-g-s's use of tooz seems to be incompatible with python3. Change-Id: Ic3f4980125a2be8e63a3596c28979b8df015afd5
Notes
Notes (review): Code-Review+2: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com> Code-Review+2: Jim Rollenhagen <jim@jimrollenhagen.com> Workflow+1: Jim Rollenhagen <jim@jimrollenhagen.com> Code-Review+1: Riccardo Pittau <elfosardo@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 14 Dec 2018 17:16:01 +0000 Reviewed-on: https://review.openstack.org/613655 Project: openstack/networking-generic-switch Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh2
-rw-r--r--playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/post.yaml15
-rw-r--r--playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/run.yaml70
-rw-r--r--zuul.d/legacy-networking-generic-switch-jobs.yaml19
-rw-r--r--zuul.d/networking-generic-switch-jobs.yaml76
-rw-r--r--zuul.d/project.yaml6
6 files changed, 82 insertions, 106 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 56998c5..cb5e716 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -23,6 +23,8 @@ GENERIC_SWITCH_USER_MAX_SESSIONS=${GENERIC_SWITCH_USER_MAX_SESSIONS:-0}
23# 0 would mean wait forever 23# 0 would mean wait forever
24GENERIC_SWITCH_DLM_ACQUIRE_TIMEOUT=${GENERIC_SWITCH_DLM_ACQUIRE_TIMEOUT:-120} 24GENERIC_SWITCH_DLM_ACQUIRE_TIMEOUT=${GENERIC_SWITCH_DLM_ACQUIRE_TIMEOUT:-120}
25 25
26enable_python3_package networking-generic-switch
27
26if ( [[ "$GENERIC_SWITCH_USER_MAX_SESSIONS" -gt 0 ]] ) && (! is_service_enabled etcd3); then 28if ( [[ "$GENERIC_SWITCH_USER_MAX_SESSIONS" -gt 0 ]] ) && (! is_service_enabled etcd3); then
27 die $LINENO "etcd3 service must be enabled to use coordination features of networking-generic-switch" 29 die $LINENO "etcd3 service must be enabled to use coordination features of networking-generic-switch"
28fi 30fi
diff --git a/playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/post.yaml b/playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/post.yaml
+++ /dev/null
@@ -1,15 +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=/logs/**
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
diff --git a/playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/run.yaml b/playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/run.yaml
deleted file mode 100644
index 636c80b..0000000
--- a/playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/run.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-networking-generic-switch-dsvm-tempest from old job
3 gate-networking-generic-switch-dsvm-tempest
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-generic-switch git://git.openstack.org/openstack/networking-generic-switch
34 OVS_PHYSICAL_BRIDGE=brbm
35 PHYSICAL_NETWORK=mynetwork
36 Q_PLUGIN=ml2
37 ENABLE_TENANT_VLANS=True
38 Q_ML2_TENANT_NETWORK_TYPE=vlan
39 TENANT_VLAN_RANGE=100:150
40 # test with DLM support enabled
41 GENERIC_SWITCH_USER_MAX_SESSIONS=2
42
43 EOF
44 executable: /bin/bash
45 chdir: '{{ ansible_user_dir }}/workspace'
46 environment: '{{ zuul | zuul_legacy_vars }}'
47
48 - shell:
49 cmd: |
50 set -e
51 set -x
52 export PYTHONUNBUFFERED=true
53 export DEVSTACK_GATE_TEMPEST=1
54 export DEVSTACK_GATE_NEUTRON=1
55 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
56 export DEVSTACK_GATE_TEMPEST_REGEX='ngs'
57 export BRANCH_OVERRIDE=default
58 export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,q-svc,q-agt,q-dhcp,q-l3,tempest,etcd3
59 export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
60 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
61 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
62 fi
63
64 export PROJECTS="openstack/networking-generic-switch $PROJECTS"
65
66 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
67 ./safe-devstack-vm-gate-wrap.sh
68 executable: /bin/bash
69 chdir: '{{ ansible_user_dir }}/workspace'
70 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/legacy-networking-generic-switch-jobs.yaml b/zuul.d/legacy-networking-generic-switch-jobs.yaml
deleted file mode 100644
index 0fbb0c4..0000000
--- a/zuul.d/legacy-networking-generic-switch-jobs.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
1- job:
2 name: networking-generic-switch-tempest-dsvm-dlm
3 parent: legacy-dsvm-base
4 irrelevant-files:
5 - ^.*\.rst$
6 - ^doc/.*$
7 - ^networking_generic_switch/tests/.*$
8 - ^releasenotes/.*$
9 - ^setup.cfg$
10 - ^test-requirements.txt$
11 - ^tools/.*$
12 - ^tox.ini$
13 run: playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/run.yaml
14 post-run: playbooks/legacy/networking-generic-switch-tempest-dsvm-dlm/post.yaml
15 timeout: 4800
16 required-projects:
17 - openstack-infra/devstack-gate
18 - openstack/networking-generic-switch
19 - openstack/tempest
diff --git a/zuul.d/networking-generic-switch-jobs.yaml b/zuul.d/networking-generic-switch-jobs.yaml
new file mode 100644
index 0000000..f94fd51
--- /dev/null
+++ b/zuul.d/networking-generic-switch-jobs.yaml
@@ -0,0 +1,76 @@
1- job:
2 name: networking-generic-switch-tempest-dlm-base
3 parent: devstack-tempest
4 irrelevant-files:
5 - ^.*\.rst$
6 - ^doc/.*$
7 - ^networking_generic_switch/tests/.*$
8 - ^releasenotes/.*$
9 - ^setup.cfg$
10 - ^test-requirements.txt$
11 - ^tools/.*$
12 - ^tox.ini$
13 timeout: 4800
14 required-projects:
15 - openstack/networking-generic-switch
16 vars:
17 tox_envlist: all-site-packages
18 tempest_test_regex: ngs
19 devstack_plugins:
20 networking-generic-switch: git://git.openstack.org/openstack/networking-generic-switch
21 devstack_localrc:
22 OVS_PHYSICAL_BRIDGE: brbm
23 PHYSICAL_NETWORK: mynetwork
24 Q_PLUGIN: ml2
25 ENABLE_TENANT_VLANS: True
26 Q_ML2_TENANT_NETWORK_TYPE: vlan
27 TENANT_VLAN_RANGE: 100:150
28 GENERIC_SWITCH_USER_MAX_SESSIONS: 2
29 devstack_services:
30 key: True
31 mysql: True
32 rabbit: True
33 q-svc: True
34 q-agt: True
35 q-dhcp: True
36 q-l3: True
37 tempest: True
38 etcd3: True
39 generic_switch: True
40 g-api: False
41 g-reg: False
42 n-api: False
43 n-api-meta: False
44 n-cauth: False
45 n-cond: False
46 n-cpu: False
47 n-novnc: False
48 n-obj: False
49 n-sch: False
50 placement-api: False
51 swift: False
52 s-proxy: False
53 s-object: False
54 s-container: False
55 s-account: False
56 cinder: False
57 c-api: False
58 c-bak: False
59 c-sch: False
60 c-vol: False
61 glace: False
62 nova: False
63
64- job:
65 name: networking-generic-switch-tempest-dlm
66 parent: networking-generic-switch-tempest-dlm-base
67 vars:
68 devstack_localrc:
69 USE_PYTHON3: True
70
71- job:
72 name: networking-generic-switch-tempest-dlm-python2
73 parent: networking-generic-switch-tempest-dlm-base
74 vars:
75 devstack_localrc:
76 USE_PYTHON3: False
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 55fb89d..b4d3eaf 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,7 +7,8 @@
7 - release-notes-jobs-python3 7 - release-notes-jobs-python3
8 check: 8 check:
9 jobs: 9 jobs:
10 - networking-generic-switch-tempest-dsvm-dlm 10 - networking-generic-switch-tempest-dlm
11 - networking-generic-switch-tempest-dlm-python2
11 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode: 12 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode:
12 irrelevant-files: 13 irrelevant-files:
13 - ^(test-|)requirements.txt$ 14 - ^(test-|)requirements.txt$
@@ -20,7 +21,8 @@
20 gate: 21 gate:
21 queue: networking-generic-switch 22 queue: networking-generic-switch
22 jobs: 23 jobs:
23 - networking-generic-switch-tempest-dsvm-dlm 24 - networking-generic-switch-tempest-dlm
25 - networking-generic-switch-tempest-dlm-python2
24 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode: 26 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode:
25 irrelevant-files: 27 irrelevant-files:
26 - ^(test-|)requirements.txt$ 28 - ^(test-|)requirements.txt$