Browse Source

Switch default functional tests to Python3

This patch is switching the default functional tests to Python3 and
adding a job to Python2.7.

Change-Id: I696ec6a40404154bd20d5c36446045755f1206d5
Closes-Bug: #1818626
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
tags/6.0.0.0b1
Lucas Alvares Gomes 2 months ago
parent
commit
6ea0301354

+ 1
- 1
networking_ovn/tests/contrib/gate_hook.sh View File

@@ -11,7 +11,7 @@ NETWORKING_OVN_PATH=$GATE_DEST/networking-ovn
11 11
 GATE_STACK_USER=stack
12 12
 
13 13
 case $VENV in
14
-"dsvm-functional"|"dsvm-functional-py35")
14
+"dsvm-functional"|"dsvm-functional-py27")
15 15
     # The logic to set YUM or DNF as the package manager lives in stackrc,
16 16
     # let's source it so it gets applied
17 17
     source $DEVSTACK_PATH/stackrc

playbooks/legacy/networking-ovn-dsvm-functional-py35/post.yaml → playbooks/legacy/networking-ovn-dsvm-functional-py27/post.yaml View File


playbooks/legacy/networking-ovn-dsvm-functional-py35/run.yaml → playbooks/legacy/networking-ovn-dsvm-functional-py27/run.yaml View File

@@ -1,6 +1,5 @@
1 1
 - hosts: all
2
-  name: Autoconverted job legacy-networking-ovn-dsvm-functional-py35 from old job
3
-    gate-networking-ovn-dsvm-functional-py35
2
+  name: Autoconverted job legacy-networking-ovn-dsvm-functional-py27 from old job gate-networking-ovn-dsvm-functional-py27
4 3
   tasks:
5 4
 
6 5
     - name: Ensure legacy workspace directory
@@ -45,12 +44,12 @@
45 44
           export PROJECTS="openstack/networking-ovn $PROJECTS"
46 45
 
47 46
           function gate_hook {
48
-              bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/gate_hook.sh dsvm-functional-py35
47
+              bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/gate_hook.sh dsvm-functional-py27
49 48
           }
50 49
           export -f gate_hook
51 50
 
52 51
           function post_test_hook {
53
-             bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/post_test_hook.sh dsvm-functional-py35
52
+             bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/post_test_hook.sh dsvm-functional-py27
54 53
           }
55 54
           export -f post_test_hook
56 55
 

+ 2
- 1
playbooks/legacy/networking-ovn-dsvm-functional/run.yaml View File

@@ -1,5 +1,6 @@
1 1
 - hosts: all
2
-  name: Autoconverted job legacy-networking-ovn-dsvm-functional from old job gate-networking-ovn-dsvm-functional
2
+  name: Autoconverted job legacy-networking-ovn-dsvm-functional from old job
3
+    gate-networking-ovn-dsvm-functional
3 4
   tasks:
4 5
 
5 6
     - name: Ensure legacy workspace directory

+ 6
- 4
tox.ini View File

@@ -30,6 +30,7 @@ basepython = python3
30 30
 commands = {posargs}
31 31
 
32 32
 [testenv:functional]
33
+basepython = python3
33 34
 setenv =
34 35
   {[testenv]setenv}
35 36
   OS_TEST_PATH=./networking_ovn/tests/functional
@@ -37,8 +38,8 @@ setenv =
37 38
 deps = {[testenv]deps}
38 39
        -r{toxinidir}/networking_ovn/tests/functional/requirements.txt
39 40
 
40
-[testenv:functional-py35]
41
-basepython = python3.5
41
+[testenv:functional-py27]
42
+basepython = python2.7
42 43
 setenv =
43 44
   {[testenv]setenv}
44 45
   OS_TEST_PATH=./networking_ovn/tests/functional
@@ -52,14 +53,15 @@ setenv = OS_TEST_TIMEOUT=240
52 53
 commands = false
53 54
 
54 55
 [testenv:dsvm-functional]
56
+basepython = python3
55 57
 setenv = {[testenv:functional]setenv}
56 58
          {[testenv:dsvm]setenv}
57 59
 deps = {[testenv:functional]deps}
58 60
 commands =
59 61
   {toxinidir}/tools/ostestr_compat_shim.sh {posargs}
60 62
 
61
-[testenv:dsvm-functional-py35]
62
-basepython = python3.5
63
+[testenv:dsvm-functional-py27]
64
+basepython = python2.7
63 65
 setenv = {[testenv:functional]setenv}
64 66
          {[testenv:dsvm]setenv}
65 67
 deps = {[testenv:functional]deps}

+ 6
- 6
zuul.d/legacy-networking-ovn-jobs.yaml View File

@@ -36,20 +36,20 @@
36 36
       - openstack/tempest
37 37
 
38 38
 - job:
39
-    name: networking-ovn-dsvm-functional
39
+    name: networking-ovn-dsvm-functional-py27
40 40
     parent: legacy-networking-ovn-dsvm-base
41
-    run: playbooks/legacy/networking-ovn-dsvm-functional/run.yaml
42
-    post-run: playbooks/legacy/networking-ovn-dsvm-functional/post.yaml
41
+    run: playbooks/legacy/networking-ovn-dsvm-functional-py27/run.yaml
42
+    post-run: playbooks/legacy/networking-ovn-dsvm-functional-py27/post.yaml
43 43
     timeout: 7800
44 44
     required-projects:
45 45
       - openstack-infra/devstack-gate
46 46
       - openstack/networking-ovn
47 47
 
48 48
 - job:
49
-    name: networking-ovn-dsvm-functional-py35
49
+    name: networking-ovn-dsvm-functional
50 50
     parent: legacy-networking-ovn-dsvm-base
51
-    run: playbooks/legacy/networking-ovn-dsvm-functional-py35/run.yaml
52
-    post-run: playbooks/legacy/networking-ovn-dsvm-functional-py35/post.yaml
51
+    run: playbooks/legacy/networking-ovn-dsvm-functional/run.yaml
52
+    post-run: playbooks/legacy/networking-ovn-dsvm-functional/post.yaml
53 53
     timeout: 7800
54 54
     required-projects:
55 55
       - openstack-infra/devstack-gate

+ 4
- 4
zuul.d/project.yaml View File

@@ -14,8 +14,8 @@
14 14
         - networking-ovn-tempest-dsvm-ovs-release
15 15
         - networking-ovn-tempest-dsvm-ovs-release-python2
16 16
         - networking-ovn-rally-task
17
-        - networking-ovn-dsvm-functional
18
-        - networking-ovn-dsvm-functional-py35:
17
+        - networking-ovn-dsvm-functional-py27
18
+        - networking-ovn-dsvm-functional:
19 19
             branches: ^(?!stable/newton).*$
20 20
         # TripleO jobs that deploy OVN.
21 21
         # Note we don't use a project-template here, so it's easier
@@ -40,8 +40,8 @@
40 40
         - networking-ovn-tempest-dsvm-ovs-release
41 41
         - networking-ovn-tempest-dsvm-ovs-release-python2
42 42
         - networking-ovn-rally-task
43
-        - networking-ovn-dsvm-functional
44
-        - networking-ovn-dsvm-functional-py35:
43
+        - networking-ovn-dsvm-functional-py27
44
+        - networking-ovn-dsvm-functional:
45 45
             branches: ^(?!stable/newton).*$
46 46
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
47 47
             branches: ^(stable/(pike|queens|rocky)).*$

Loading…
Cancel
Save