Browse Source

Transition to python 3.x primary gates

This patch renames the python 3.x jobs to be the main gate jobs and
renames the python 2.7 gates to -py2- gates.

Job aliases are included for the transition period in other repositories.

This is in preparation for python2.7 EOL[1].

[1] https://legacy.python.org/dev/peps/pep-0373/

Change-Id: I79e20152826b946dbdf7baa5d8999aeee1558f43
Michael Johnson 4 months ago
parent
commit
9153af1120
2 changed files with 41 additions and 26 deletions
  1. 29
    14
      zuul.d/jobs.yaml
  2. 12
    12
      zuul.d/projects.yaml

+ 29
- 14
zuul.d/jobs.yaml View File

@@ -16,6 +16,7 @@
16 16
     vars:
17 17
       devstack_localrc:
18 18
         TEMPEST_PLUGINS: "'/opt/stack/octavia-tempest-plugin'"
19
+        USE_PYTHON3: true
19 20
       devstack_local_conf:
20 21
         post-config:
21 22
           $OCTAVIA_CONF:
@@ -104,20 +105,20 @@
104 105
       tox_envlist: all
105 106
 
106 107
 - job:
107
-    name: octavia-v2-dsvm-noop-py35-api
108
+    name: octavia-v2-dsvm-noop-py2-api
108 109
     parent: octavia-v2-dsvm-noop-api
109 110
     vars:
110 111
       devstack_localrc:
111
-        USE_PYTHON3: true
112
+        USE_PYTHON3: False
112 113
 
113 114
 - job:
114
-    name: octavia-v2-dsvm-noop-api-stable-rocky
115
-    parent: octavia-v2-dsvm-noop-api
115
+    name: octavia-v2-dsvm-noop-py2-api-stable-rocky
116
+    parent: octavia-v2-dsvm-noop-py2-api
116 117
     override-checkout: stable/rocky
117 118
 
118 119
 - job:
119
-    name: octavia-v2-dsvm-noop-api-stable-queens
120
-    parent: octavia-v2-dsvm-noop-api
120
+    name: octavia-v2-dsvm-noop-py2-api-stable-queens
121
+    parent: octavia-v2-dsvm-noop-py2-api
121 122
     override-checkout: stable/queens
122 123
 
123 124
 - job:
@@ -134,25 +135,25 @@
134 135
       tox_envlist: all
135 136
 
136 137
 - job:
137
-    name: octavia-v2-dsvm-py35-scenario
138
+    name: octavia-v2-dsvm-py2-scenario
138 139
     parent: octavia-v2-dsvm-scenario
139 140
     vars:
140 141
       devstack_localrc:
141
-        USE_PYTHON3: true
142
+        USE_PYTHON3: False
142 143
 
143 144
 - job:
144
-    name: octavia-v2-dsvm-scenario-stable-rocky
145
-    parent: octavia-v2-dsvm-scenario
145
+    name: octavia-v2-dsvm-py2-scenario-stable-rocky
146
+    parent: octavia-v2-dsvm-py2-scenario
146 147
     override-checkout: stable/rocky
147 148
 
148 149
 - job:
149
-    name: octavia-v2-dsvm-scenario-stable-queens
150
-    parent: octavia-v2-dsvm-scenario
150
+    name: octavia-v2-dsvm-py2-scenario-stable-queens
151
+    parent: octavia-v2-dsvm-py2-scenario
151 152
     override-checkout: stable/queens
152 153
 
153 154
 - job:
154
-    name: octavia-v2-dsvm-scenario-centos-7
155
-    parent: octavia-v2-dsvm-scenario
155
+    name: octavia-v2-dsvm-py2-scenario-centos-7
156
+    parent: octavia-v2-dsvm-py2-scenario
156 157
     nodeset: devstack-single-node-centos-7
157 158
     vars:
158 159
       devstack_localrc:
@@ -167,3 +168,17 @@
167 168
       devstack_localrc:
168 169
         OCTAVIA_AMP_BASE_OS: ubuntu
169 170
         OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: bionic
171
+
172
+# Temporary transitional aliases for gates used in other repos
173
+# Remove once octavia has transitioned job names
174
+- job:
175
+    name: octavia-v2-dsvm-noop-py35-api
176
+    parent: octavia-v2-dsvm-noop-api
177
+
178
+- job:
179
+    name: octavia-v2-dsvm-py35-scenario
180
+    parent: octavia-v2-dsvm-scenario
181
+
182
+- job:
183
+    name: octavia-v2-dsvm-scenario-centos-7
184
+    parent: octavia-v2-dsvm-py2-scenario-centos-7

+ 12
- 12
zuul.d/projects.yaml View File

@@ -8,13 +8,13 @@
8 8
     check:
9 9
       jobs:
10 10
         - octavia-v2-dsvm-noop-api
11
-        - octavia-v2-dsvm-noop-api-stable-rocky
12
-        - octavia-v2-dsvm-noop-api-stable-queens
13
-        - octavia-v2-dsvm-noop-py35-api
11
+        - octavia-v2-dsvm-noop-py2-api
12
+        - octavia-v2-dsvm-noop-py2-api-stable-rocky
13
+        - octavia-v2-dsvm-noop-py2-api-stable-queens
14 14
         - octavia-v2-dsvm-scenario
15
-        - octavia-v2-dsvm-scenario-stable-rocky
16
-        - octavia-v2-dsvm-scenario-stable-queens
17
-        - octavia-v2-dsvm-py35-scenario
15
+        - octavia-v2-dsvm-py2-scenario
16
+        - octavia-v2-dsvm-py2-scenario-stable-rocky
17
+        - octavia-v2-dsvm-py2-scenario-stable-queens
18 18
         - octavia-v2-dsvm-scenario-centos-7:
19 19
             voting: false
20 20
         - octavia-v2-dsvm-scenario-ubuntu-bionic:
@@ -23,10 +23,10 @@
23 23
       queue: octavia
24 24
       jobs:
25 25
         - octavia-v2-dsvm-noop-api
26
-        - octavia-v2-dsvm-noop-api-stable-rocky
27
-        - octavia-v2-dsvm-noop-api-stable-queens
28
-        - octavia-v2-dsvm-noop-py35-api
26
+        - octavia-v2-dsvm-noop-py2-api
27
+        - octavia-v2-dsvm-noop-py2-api-stable-rocky
28
+        - octavia-v2-dsvm-noop-py2-api-stable-queens
29 29
         - octavia-v2-dsvm-scenario
30
-        - octavia-v2-dsvm-scenario-stable-rocky
31
-        - octavia-v2-dsvm-scenario-stable-queens
32
-        - octavia-v2-dsvm-py35-scenario
30
+        - octavia-v2-dsvm-py2-scenario
31
+        - octavia-v2-dsvm-py2-scenario-stable-rocky
32
+        - octavia-v2-dsvm-py2-scenario-stable-queens

Loading…
Cancel
Save