Browse Source

Fixup gate names after LBaaS v2 removal

As Octavia is now the only supported LBaaS option, we can remove
"-octavia" suffix from job names. Also neutron-lbaasv2 is removed from
required projects in base job definition.

Change-Id: I35abbb73249dd907b3b5055287624929b121afb3
Implements: blueprint remove-lbaasv2
Michał Dulko 3 months ago
parent
commit
f4ba0dd6c5
6 changed files with 64 additions and 66 deletions
  1. 0
    1
      .zuul.d/base.yaml
  2. 3
    3
      .zuul.d/multi-vif.yaml
  3. 6
    7
      .zuul.d/multinode.yaml
  4. 34
    34
      .zuul.d/octavia.yaml
  5. 19
    19
      .zuul.d/project.yaml
  6. 2
    2
      .zuul.d/sdn.yaml

+ 0
- 1
.zuul.d/base.yaml View File

@@ -21,7 +21,6 @@
21 21
       - openstack/devstack-plugin-container
22 22
       - openstack/kuryr-kubernetes
23 23
       - openstack/kuryr-tempest-plugin
24
-      - openstack/neutron-lbaas
25 24
       - openstack/tempest
26 25
     post-run: playbooks/copy-k8s-logs.yaml
27 26
     host-vars:

+ 3
- 3
.zuul.d/multi-vif.yaml View File

@@ -13,10 +13,10 @@
13 13
 # limitations under the License.
14 14
 
15 15
 - job:
16
-    name: kuryr-kubernetes-tempest-openshift-octavia-multi-vif
17
-    parent: kuryr-kubernetes-tempest-openshift-octavia
16
+    name: kuryr-kubernetes-tempest-openshift-multi-vif
17
+    parent: kuryr-kubernetes-tempest-openshift
18 18
     description: |
19
-      Kuryr-Kubernetes tempest job using octavia, Openshift and NPWG multi-vif driver
19
+      Kuryr-Kubernetes tempest job using Openshift and NPWG multi-vif driver
20 20
     vars:
21 21
       devstack_localrc:
22 22
         KURYR_MULTI_VIF_DRIVER: npwg_multiple_interfaces

+ 6
- 7
.zuul.d/multinode.yaml View File

@@ -13,10 +13,10 @@
13 13
 # limitations under the License.
14 14
 
15 15
 - job:
16
-    name: kuryr-kubernetes-tempest-multinode-octavia-containerized
17
-    parent: kuryr-kubernetes-tempest-octavia
16
+    name: kuryr-kubernetes-tempest-multinode-containerized
17
+    parent: kuryr-kubernetes-tempest
18 18
     description: |
19
-        Kuryr-Kubernetes tempest multinode job using octavia
19
+        Kuryr-Kubernetes tempest multinode job
20 20
     nodeset: openstack-two-node
21 21
     host-vars:
22 22
       controller:
@@ -55,11 +55,10 @@
55 55
     voting: false
56 56
 
57 57
 - job:
58
-    name: kuryr-kubernetes-tempest-multinode-octavia-ha
59
-    parent: kuryr-kubernetes-tempest-multinode-octavia-containerized
58
+    name: kuryr-kubernetes-tempest-multinode-ha
59
+    parent: kuryr-kubernetes-tempest-multinode-containerized
60 60
     description: |
61
-        Kuryr-Kubernetes tempest multinode job using octavia and running
62
-        containerized in HA
61
+        Kuryr-Kubernetes tempest multinode job running containerized in HA
63 62
     timeout: 7800
64 63
     vars:
65 64
       devstack_localrc:

+ 34
- 34
.zuul.d/octavia.yaml View File

@@ -13,7 +13,7 @@
13 13
 # limitations under the License.
14 14
 
15 15
 - job:
16
-    name: kuryr-kubernetes-tempest-octavia
16
+    name: kuryr-kubernetes-tempest
17 17
     parent: kuryr-kubernetes-tempest-base
18 18
     description: |
19 19
       Kuryr-Kubernetes tempest job using octavia
@@ -46,33 +46,33 @@
46 46
         o-hm: true
47 47
 
48 48
 - job:
49
-    name: kuryr-kubernetes-tempest-octavia-centos-7
50
-    parent: kuryr-kubernetes-tempest-octavia
49
+    name: kuryr-kubernetes-tempest-centos-7
50
+    parent: kuryr-kubernetes-tempest
51 51
     nodeset: openstack-centos-7-single-node
52 52
     voting: false
53 53
 
54 54
 - job:
55
-    name: kuryr-kubernetes-tempest-octavia-py36
56
-    parent: kuryr-kubernetes-tempest-octavia
55
+    name: kuryr-kubernetes-tempest-py36
56
+    parent: kuryr-kubernetes-tempest
57 57
     description: |
58
-      Tempest with Octavia with DevStack running on Python 3.6
58
+      Tempest with DevStack running on Python 3.6
59 59
     vars:
60 60
       devstack_localrc:
61 61
         USE_PYTHON3: true
62 62
 
63 63
 - job:
64
-    name: kuryr-kubernetes-tempest-containerized-octavia
65
-    parent: kuryr-kubernetes-tempest-octavia
64
+    name: kuryr-kubernetes-tempest-containerized
65
+    parent: kuryr-kubernetes-tempest
66 66
     description: |
67
-        Kuryr-Kubernetes tempest job using octavia, kuryr containerized
67
+        Kuryr-Kubernetes tempest job running kuryr containerized
68 68
     vars:
69 69
       devstack_localrc:
70 70
         KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
71 71
     voting: false
72 72
 
73 73
 - job:
74
-    name: kuryr-kubernetes-tempest-containerized-octavia-l2
75
-    parent: kuryr-kubernetes-tempest-containerized-octavia
74
+    name: kuryr-kubernetes-tempest-containerized-l2
75
+    parent: kuryr-kubernetes-tempest-containerized
76 76
     description: |
77 77
         Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized
78 78
     vars:
@@ -80,10 +80,10 @@
80 80
         KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
81 81
 
82 82
 - job:
83
-    name: kuryr-kubernetes-tempest-openshift-octavia
84
-    parent: kuryr-kubernetes-tempest-octavia
83
+    name: kuryr-kubernetes-tempest-openshift
84
+    parent: kuryr-kubernetes-tempest
85 85
     description: |
86
-      Kuryr-Kubernetes tempest job using octavia and OpenShift
86
+      Kuryr-Kubernetes tempest job using OpenShift
87 87
     vars:
88 88
       devstack_localrc:
89 89
         DOCKER_CGROUP_DRIVER: "systemd"
@@ -102,10 +102,10 @@
102 102
     voting: false
103 103
 
104 104
 - job:
105
-    name: kuryr-kubernetes-tempest-containerized-octavia-pools-namespace
105
+    name: kuryr-kubernetes-tempest-containerized-pools-namespace
106 106
     description: |
107
-      Tempest with Octavia, CNI daemon, containers, port pools and namespace subnet driver
108
-    parent: kuryr-kubernetes-tempest-containerized-octavia
107
+      Tempest with containers, port pools and namespace subnet driver
108
+    parent: kuryr-kubernetes-tempest-containerized
109 109
     vars:
110 110
       devstack_localrc:
111 111
         KURYR_SUBNET_DRIVER: namespace
@@ -116,10 +116,10 @@
116 116
         KURYR_VIF_POOL_DRIVER: neutron
117 117
 
118 118
 - job:
119
-    name: kuryr-kubernetes-tempest-containerized-octavia-network-policy
119
+    name: kuryr-kubernetes-tempest-containerized-network-policy
120 120
     description: |
121
-      Tempest with Octavia, CNI daemon, containers and network policy driver
122
-    parent: kuryr-kubernetes-tempest-containerized-octavia
121
+      Tempest with Octavia, containers and network policy driver
122
+    parent: kuryr-kubernetes-tempest-containerized
123 123
     vars:
124 124
       tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_network_policy.TestNetworkPolicyScenario)'
125 125
       devstack_localrc:
@@ -129,10 +129,10 @@
129 129
     voting: false
130 130
 
131 131
 - job:
132
-    name: kuryr-kubernetes-tempest-containerized-octavia-py36
132
+    name: kuryr-kubernetes-tempest-containerized-py36
133 133
     description: |
134
-      Tempest with Octavia and Kuryr running on Python3.6 containers
135
-    parent: kuryr-kubernetes-tempest-containerized-octavia
134
+      Tempest with Kuryr running on Python3.6 containers
135
+    parent: kuryr-kubernetes-tempest-containerized
136 136
     vars:
137 137
       devstack_localrc:
138 138
         KURYR_CONTAINERS_USE_PY3: True
@@ -140,17 +140,17 @@
140 140
     voting: true
141 141
 
142 142
 - job:
143
-    name: kuryr-kubernetes-tempest-containerized-openshift-octavia
144
-    description: Tempest with Octavia, containers and OpenShift
145
-    parent: kuryr-kubernetes-tempest-openshift-octavia
143
+    name: kuryr-kubernetes-tempest-containerized-openshift
144
+    description: Tempest with containers and OpenShift
145
+    parent: kuryr-kubernetes-tempest-openshift
146 146
     vars:
147 147
       devstack_localrc:
148 148
         KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
149 149
 
150 150
 - job:
151
-    name: kuryr-kubernetes-tempest-containerized-openshift-octavia-serial
152
-    description: Tempest with Octavia running in serial, containers and OpenShift
153
-    parent: kuryr-kubernetes-tempest-containerized-openshift-octavia
151
+    name: kuryr-kubernetes-tempest-containerized-openshift-serial
152
+    description: Tempest running in serial, containers and OpenShift
153
+    parent: kuryr-kubernetes-tempest-containerized-openshift
154 154
     vars:
155 155
       devstack_localrc:
156 156
         KURYR_K8S_SERIAL_TESTS: True
@@ -158,10 +158,10 @@
158 158
 
159 159
 
160 160
 - job:
161
-   name: kuryr-kubernetes-tempest-openshift-octavia-ingress
162
-   parent: kuryr-kubernetes-tempest-openshift-octavia
161
+   name: kuryr-kubernetes-tempest-openshift-ingress
162
+   parent: kuryr-kubernetes-tempest-openshift
163 163
    description: |
164
-     Kuryr-Kubernetes tempest job using octavia, ingress controller and OpenShift
164
+     Kuryr-Kubernetes tempest job using ingress controller and OpenShift
165 165
    vars:
166 166
      devstack_localrc:
167 167
        KURYR_ENABLE_INGRESS: true
@@ -169,8 +169,8 @@
169 169
    voting: false
170 170
 
171 171
 - job:
172
-    name: kuryr-kubernetes-tempest-containerized-octavia-crio
173
-    parent: kuryr-kubernetes-tempest-containerized-octavia
172
+    name: kuryr-kubernetes-tempest-containerized-crio
173
+    parent: kuryr-kubernetes-tempest-containerized
174 174
     nodeset: openstack-single-node-bionic
175 175
     vars:
176 176
       devstack_localrc:

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

@@ -16,32 +16,32 @@
16 16
     name: kuryr-kubernetes-tempest-jobs
17 17
     check:
18 18
       jobs:
19
-        - kuryr-kubernetes-tempest-octavia
20
-        - kuryr-kubernetes-tempest-openshift-octavia
21
-        - kuryr-kubernetes-tempest-containerized-octavia
19
+        - kuryr-kubernetes-tempest
20
+        - kuryr-kubernetes-tempest-openshift
21
+        - kuryr-kubernetes-tempest-containerized
22 22
         - kuryr-kubernetes-tempest-containerized-ovn
23
-        - kuryr-kubernetes-tempest-octavia-py36
24
-        - kuryr-kubernetes-tempest-containerized-octavia-py36
25
-        - kuryr-kubernetes-tempest-multinode-octavia-containerized
26
-        - kuryr-kubernetes-tempest-octavia-centos-7
23
+        - kuryr-kubernetes-tempest-py36
24
+        - kuryr-kubernetes-tempest-containerized-py36
25
+        - kuryr-kubernetes-tempest-multinode-containerized
26
+        - kuryr-kubernetes-tempest-centos-7
27 27
     gate:
28 28
       jobs:
29
-        - kuryr-kubernetes-tempest-octavia
30
-        - kuryr-kubernetes-tempest-octavia-py36
31
-        - kuryr-kubernetes-tempest-containerized-octavia-py36
29
+        - kuryr-kubernetes-tempest
30
+        - kuryr-kubernetes-tempest-py36
31
+        - kuryr-kubernetes-tempest-containerized-py36
32 32
     experimental:
33 33
       jobs:
34 34
         - kuryr-kubernetes-tempest-dragonflow
35
-        - kuryr-kubernetes-tempest-containerized-openshift-octavia
36
-        - kuryr-kubernetes-tempest-containerized-octavia-l2
37
-        - kuryr-kubernetes-tempest-containerized-octavia-pools-namespace
38
-        - kuryr-kubernetes-tempest-containerized-octavia-network-policy
39
-        - kuryr-kubernetes-tempest-containerized-openshift-octavia-serial
35
+        - kuryr-kubernetes-tempest-containerized-openshift
36
+        - kuryr-kubernetes-tempest-containerized-l2
37
+        - kuryr-kubernetes-tempest-containerized-pools-namespace
38
+        - kuryr-kubernetes-tempest-containerized-network-policy
39
+        - kuryr-kubernetes-tempest-containerized-openshift-serial
40 40
         - kuryr-kubernetes-tempest-ovn
41
-        - kuryr-kubernetes-tempest-openshift-octavia-ingress
42
-        - kuryr-kubernetes-tempest-openshift-octavia-multi-vif
43
-        - kuryr-kubernetes-tempest-multinode-octavia-ha
44
-        - kuryr-kubernetes-tempest-containerized-octavia-crio
41
+        - kuryr-kubernetes-tempest-openshift-ingress
42
+        - kuryr-kubernetes-tempest-openshift-multi-vif
43
+        - kuryr-kubernetes-tempest-multinode-ha
44
+        - kuryr-kubernetes-tempest-containerized-crio
45 45
 
46 46
 - project:
47 47
     templates:

+ 2
- 2
.zuul.d/sdn.yaml View File

@@ -14,7 +14,7 @@
14 14
 
15 15
 - job:
16 16
     name: kuryr-kubernetes-tempest-ovn
17
-    parent: kuryr-kubernetes-tempest-octavia
17
+    parent: kuryr-kubernetes-tempest
18 18
     description: |
19 19
         Kuryr-Kubernetes tempest job using OVN
20 20
     required-projects:
@@ -54,7 +54,7 @@
54 54
 
55 55
 - job:
56 56
     name: kuryr-kubernetes-tempest-dragonflow
57
-    parent: kuryr-kubernetes-tempest-octavia
57
+    parent: kuryr-kubernetes-tempest
58 58
     description: |
59 59
       Kuryr-Kubernetes tempest job using Dragonflow
60 60
     required-projects:

Loading…
Cancel
Save