openstack/kuryr-kubernetes
Code Issues Proposed changes

Fixup gate names after LBaaS v2 removal

Browse Source 
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
This commit is contained in:
Michał Dulko 2019-01-23 10:48:52 +01:00
parent 3e3ed9dbb3
commit f4ba0dd6c5
6 changed files with 64 additions and 66 deletions

1
.zuul.d/base.yaml

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

6
.zuul.d/multi-vif.yaml

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

13
.zuul.d/multinode.yaml

@ -13,10 +13,10 @@
# limitations under the License. # limitations under the License.
- job: - job:
name: kuryr-kubernetes-tempest-multinode-octavia-containerized name: kuryr-kubernetes-tempest-multinode-containerized
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
description: | description: |
Kuryr-Kubernetes tempest multinode job using octavia Kuryr-Kubernetes tempest multinode job
nodeset: openstack-two-node nodeset: openstack-two-node
host-vars: host-vars:
controller: controller:
@ -55,11 +55,10 @@
voting: false voting: false
- job: - job:
name: kuryr-kubernetes-tempest-multinode-octavia-ha name: kuryr-kubernetes-tempest-multinode-ha
parent: kuryr-kubernetes-tempest-multinode-octavia-containerized parent: kuryr-kubernetes-tempest-multinode-containerized
description: | description: |
Kuryr-Kubernetes tempest multinode job using octavia and running Kuryr-Kubernetes tempest multinode job running containerized in HA
containerized in HA
timeout: 7800 timeout: 7800
vars: vars:
devstack_localrc: devstack_localrc:

68
.zuul.d/octavia.yaml

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
- job: - job:
name: kuryr-kubernetes-tempest-octavia name: kuryr-kubernetes-tempest
parent: kuryr-kubernetes-tempest-base parent: kuryr-kubernetes-tempest-base
description: | description: |
Kuryr-Kubernetes tempest job using octavia Kuryr-Kubernetes tempest job using octavia
@ -46,33 +46,33 @@
o-hm: true o-hm: true
- job: - job:
name: kuryr-kubernetes-tempest-octavia-centos-7 name: kuryr-kubernetes-tempest-centos-7
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
nodeset: openstack-centos-7-single-node nodeset: openstack-centos-7-single-node
voting: false voting: false
- job: - job:
name: kuryr-kubernetes-tempest-octavia-py36 name: kuryr-kubernetes-tempest-py36
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
description: | description: |
Tempest with Octavia with DevStack running on Python 3.6 Tempest with DevStack running on Python 3.6
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: true USE_PYTHON3: true
- job: - job:
name: kuryr-kubernetes-tempest-containerized-octavia name: kuryr-kubernetes-tempest-containerized
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
description: | description: |
Kuryr-Kubernetes tempest job using octavia, kuryr containerized Kuryr-Kubernetes tempest job running kuryr containerized
vars: vars:
devstack_localrc: devstack_localrc:
KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
voting: false voting: false
- job: - job:
name: kuryr-kubernetes-tempest-containerized-octavia-l2 name: kuryr-kubernetes-tempest-containerized-l2
parent: kuryr-kubernetes-tempest-containerized-octavia parent: kuryr-kubernetes-tempest-containerized
description: | description: |
Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized
vars: vars:
@ -80,10 +80,10 @@
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2 KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
- job: - job:
name: kuryr-kubernetes-tempest-openshift-octavia name: kuryr-kubernetes-tempest-openshift
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
description: | description: |
Kuryr-Kubernetes tempest job using octavia and OpenShift Kuryr-Kubernetes tempest job using OpenShift
vars: vars:
devstack_localrc: devstack_localrc:
DOCKER_CGROUP_DRIVER: "systemd" DOCKER_CGROUP_DRIVER: "systemd"
@ -102,10 +102,10 @@
voting: false voting: false
- job: - job:
name: kuryr-kubernetes-tempest-containerized-octavia-pools-namespace name: kuryr-kubernetes-tempest-containerized-pools-namespace
description: | description: |
Tempest with Octavia, CNI daemon, containers, port pools and namespace subnet driver Tempest with containers, port pools and namespace subnet driver
parent: kuryr-kubernetes-tempest-containerized-octavia parent: kuryr-kubernetes-tempest-containerized
vars: vars:
devstack_localrc: devstack_localrc:
KURYR_SUBNET_DRIVER: namespace KURYR_SUBNET_DRIVER: namespace
@ -116,10 +116,10 @@
KURYR_VIF_POOL_DRIVER: neutron KURYR_VIF_POOL_DRIVER: neutron
- job: - job:
name: kuryr-kubernetes-tempest-containerized-octavia-network-policy name: kuryr-kubernetes-tempest-containerized-network-policy
description: | description: |
Tempest with Octavia, CNI daemon, containers and network policy driver Tempest with Octavia, containers and network policy driver
parent: kuryr-kubernetes-tempest-containerized-octavia parent: kuryr-kubernetes-tempest-containerized
vars: vars:
tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_network_policy.TestNetworkPolicyScenario)' tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_network_policy.TestNetworkPolicyScenario)'
devstack_localrc: devstack_localrc:
@ -129,10 +129,10 @@
voting: false voting: false
- job: - job:
name: kuryr-kubernetes-tempest-containerized-octavia-py36 name: kuryr-kubernetes-tempest-containerized-py36
description: | description: |
Tempest with Octavia and Kuryr running on Python3.6 containers Tempest with Kuryr running on Python3.6 containers
parent: kuryr-kubernetes-tempest-containerized-octavia parent: kuryr-kubernetes-tempest-containerized
vars: vars:
devstack_localrc: devstack_localrc:
KURYR_CONTAINERS_USE_PY3: True KURYR_CONTAINERS_USE_PY3: True
@ -140,17 +140,17 @@
voting: true voting: true
- job: - job:
name: kuryr-kubernetes-tempest-containerized-openshift-octavia name: kuryr-kubernetes-tempest-containerized-openshift
description: Tempest with Octavia, containers and OpenShift description: Tempest with containers and OpenShift
parent: kuryr-kubernetes-tempest-openshift-octavia parent: kuryr-kubernetes-tempest-openshift
vars: vars:
devstack_localrc: devstack_localrc:
KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
- job: - job:
name: kuryr-kubernetes-tempest-containerized-openshift-octavia-serial name: kuryr-kubernetes-tempest-containerized-openshift-serial
description: Tempest with Octavia running in serial, containers and OpenShift description: Tempest running in serial, containers and OpenShift
parent: kuryr-kubernetes-tempest-containerized-openshift-octavia parent: kuryr-kubernetes-tempest-containerized-openshift
vars: vars:
devstack_localrc: devstack_localrc:
KURYR_K8S_SERIAL_TESTS: True KURYR_K8S_SERIAL_TESTS: True
@ -158,10 +158,10 @@
- job: - job:
name: kuryr-kubernetes-tempest-openshift-octavia-ingress name: kuryr-kubernetes-tempest-openshift-ingress
parent: kuryr-kubernetes-tempest-openshift-octavia parent: kuryr-kubernetes-tempest-openshift
description: | description: |
Kuryr-Kubernetes tempest job using octavia, ingress controller and OpenShift Kuryr-Kubernetes tempest job using ingress controller and OpenShift
vars: vars:
devstack_localrc: devstack_localrc:
KURYR_ENABLE_INGRESS: true KURYR_ENABLE_INGRESS: true
@ -169,8 +169,8 @@
voting: false voting: false
- job: - job:
name: kuryr-kubernetes-tempest-containerized-octavia-crio name: kuryr-kubernetes-tempest-containerized-crio
parent: kuryr-kubernetes-tempest-containerized-octavia parent: kuryr-kubernetes-tempest-containerized
nodeset: openstack-single-node-bionic nodeset: openstack-single-node-bionic
vars: vars:
devstack_localrc: devstack_localrc:

38
.zuul.d/project.yaml

@ -16,32 +16,32 @@
name: kuryr-kubernetes-tempest-jobs name: kuryr-kubernetes-tempest-jobs
check: check:
jobs: jobs:
- kuryr-kubernetes-tempest-octavia - kuryr-kubernetes-tempest
- kuryr-kubernetes-tempest-openshift-octavia - kuryr-kubernetes-tempest-openshift
- kuryr-kubernetes-tempest-containerized-octavia - kuryr-kubernetes-tempest-containerized
- kuryr-kubernetes-tempest-containerized-ovn - kuryr-kubernetes-tempest-containerized-ovn
- kuryr-kubernetes-tempest-octavia-py36 - kuryr-kubernetes-tempest-py36
- kuryr-kubernetes-tempest-containerized-octavia-py36 - kuryr-kubernetes-tempest-containerized-py36
- kuryr-kubernetes-tempest-multinode-octavia-containerized - kuryr-kubernetes-tempest-multinode-containerized
- kuryr-kubernetes-tempest-octavia-centos-7 - kuryr-kubernetes-tempest-centos-7
gate: gate:
jobs: jobs:
- kuryr-kubernetes-tempest-octavia - kuryr-kubernetes-tempest
- kuryr-kubernetes-tempest-octavia-py36 - kuryr-kubernetes-tempest-py36
- kuryr-kubernetes-tempest-containerized-octavia-py36 - kuryr-kubernetes-tempest-containerized-py36
experimental: experimental:
jobs: jobs:
- kuryr-kubernetes-tempest-dragonflow - kuryr-kubernetes-tempest-dragonflow
- kuryr-kubernetes-tempest-containerized-openshift-octavia - kuryr-kubernetes-tempest-containerized-openshift
- kuryr-kubernetes-tempest-containerized-octavia-l2 - kuryr-kubernetes-tempest-containerized-l2
- kuryr-kubernetes-tempest-containerized-octavia-pools-namespace - kuryr-kubernetes-tempest-containerized-pools-namespace
- kuryr-kubernetes-tempest-containerized-octavia-network-policy - kuryr-kubernetes-tempest-containerized-network-policy
- kuryr-kubernetes-tempest-containerized-openshift-octavia-serial - kuryr-kubernetes-tempest-containerized-openshift-serial
- kuryr-kubernetes-tempest-ovn - kuryr-kubernetes-tempest-ovn
- kuryr-kubernetes-tempest-openshift-octavia-ingress - kuryr-kubernetes-tempest-openshift-ingress
- kuryr-kubernetes-tempest-openshift-octavia-multi-vif - kuryr-kubernetes-tempest-openshift-multi-vif
- kuryr-kubernetes-tempest-multinode-octavia-ha - kuryr-kubernetes-tempest-multinode-ha
- kuryr-kubernetes-tempest-containerized-octavia-crio - kuryr-kubernetes-tempest-containerized-crio
- project: - project:
templates: templates:

4
.zuul.d/sdn.yaml

@ -14,7 +14,7 @@
- job: - job:
name: kuryr-kubernetes-tempest-ovn name: kuryr-kubernetes-tempest-ovn
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
description: | description: |
Kuryr-Kubernetes tempest job using OVN Kuryr-Kubernetes tempest job using OVN
required-projects: required-projects:
@ -54,7 +54,7 @@
- job: - job:
name: kuryr-kubernetes-tempest-dragonflow name: kuryr-kubernetes-tempest-dragonflow
parent: kuryr-kubernetes-tempest-octavia parent: kuryr-kubernetes-tempest
description: | description: |
Kuryr-Kubernetes tempest job using Dragonflow Kuryr-Kubernetes tempest job using Dragonflow
required-projects: required-projects: