From f4ba0dd6c5aeff1a50add690ca3384973d7fffc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Wed, 23 Jan 2019 10:48:52 +0100 Subject: [PATCH] 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 --- .zuul.d/base.yaml | 1 - .zuul.d/multi-vif.yaml | 6 ++-- .zuul.d/multinode.yaml | 13 ++++---- .zuul.d/octavia.yaml | 68 +++++++++++++++++++++--------------------- .zuul.d/project.yaml | 38 +++++++++++------------ .zuul.d/sdn.yaml | 4 +-- 6 files changed, 64 insertions(+), 66 deletions(-) diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 98a4edc18..997c344d0 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -21,7 +21,6 @@ - openstack/devstack-plugin-container - openstack/kuryr-kubernetes - openstack/kuryr-tempest-plugin - - openstack/neutron-lbaas - openstack/tempest post-run: playbooks/copy-k8s-logs.yaml host-vars: diff --git a/.zuul.d/multi-vif.yaml b/.zuul.d/multi-vif.yaml index 3109b7b8c..a61c43525 100644 --- a/.zuul.d/multi-vif.yaml +++ b/.zuul.d/multi-vif.yaml @@ -13,10 +13,10 @@ # limitations under the License. - job: - name: kuryr-kubernetes-tempest-openshift-octavia-multi-vif - parent: kuryr-kubernetes-tempest-openshift-octavia + name: kuryr-kubernetes-tempest-openshift-multi-vif + parent: kuryr-kubernetes-tempest-openshift 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: devstack_localrc: KURYR_MULTI_VIF_DRIVER: npwg_multiple_interfaces diff --git a/.zuul.d/multinode.yaml b/.zuul.d/multinode.yaml index 7151cbabb..b36baf7a5 100644 --- a/.zuul.d/multinode.yaml +++ b/.zuul.d/multinode.yaml @@ -13,10 +13,10 @@ # limitations under the License. - job: - name: kuryr-kubernetes-tempest-multinode-octavia-containerized - parent: kuryr-kubernetes-tempest-octavia + name: kuryr-kubernetes-tempest-multinode-containerized + parent: kuryr-kubernetes-tempest description: | - Kuryr-Kubernetes tempest multinode job using octavia + Kuryr-Kubernetes tempest multinode job nodeset: openstack-two-node host-vars: controller: @@ -55,11 +55,10 @@ voting: false - job: - name: kuryr-kubernetes-tempest-multinode-octavia-ha - parent: kuryr-kubernetes-tempest-multinode-octavia-containerized + name: kuryr-kubernetes-tempest-multinode-ha + parent: kuryr-kubernetes-tempest-multinode-containerized description: | - Kuryr-Kubernetes tempest multinode job using octavia and running - containerized in HA + Kuryr-Kubernetes tempest multinode job running containerized in HA timeout: 7800 vars: devstack_localrc: diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml index a7c9d12d1..691f3acd2 100644 --- a/.zuul.d/octavia.yaml +++ b/.zuul.d/octavia.yaml @@ -13,7 +13,7 @@ # limitations under the License. - job: - name: kuryr-kubernetes-tempest-octavia + name: kuryr-kubernetes-tempest parent: kuryr-kubernetes-tempest-base description: | Kuryr-Kubernetes tempest job using octavia @@ -46,33 +46,33 @@ o-hm: true - job: - name: kuryr-kubernetes-tempest-octavia-centos-7 - parent: kuryr-kubernetes-tempest-octavia + name: kuryr-kubernetes-tempest-centos-7 + parent: kuryr-kubernetes-tempest nodeset: openstack-centos-7-single-node voting: false - job: - name: kuryr-kubernetes-tempest-octavia-py36 - parent: kuryr-kubernetes-tempest-octavia + name: kuryr-kubernetes-tempest-py36 + parent: kuryr-kubernetes-tempest description: | - Tempest with Octavia with DevStack running on Python 3.6 + Tempest with DevStack running on Python 3.6 vars: devstack_localrc: USE_PYTHON3: true - job: - name: kuryr-kubernetes-tempest-containerized-octavia - parent: kuryr-kubernetes-tempest-octavia + name: kuryr-kubernetes-tempest-containerized + parent: kuryr-kubernetes-tempest description: | - Kuryr-Kubernetes tempest job using octavia, kuryr containerized + Kuryr-Kubernetes tempest job running kuryr containerized vars: devstack_localrc: KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true voting: false - job: - name: kuryr-kubernetes-tempest-containerized-octavia-l2 - parent: kuryr-kubernetes-tempest-containerized-octavia + name: kuryr-kubernetes-tempest-containerized-l2 + parent: kuryr-kubernetes-tempest-containerized description: | Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized vars: @@ -80,10 +80,10 @@ KURYR_K8S_OCTAVIA_MEMBER_MODE: L2 - job: - name: kuryr-kubernetes-tempest-openshift-octavia - parent: kuryr-kubernetes-tempest-octavia + name: kuryr-kubernetes-tempest-openshift + parent: kuryr-kubernetes-tempest description: | - Kuryr-Kubernetes tempest job using octavia and OpenShift + Kuryr-Kubernetes tempest job using OpenShift vars: devstack_localrc: DOCKER_CGROUP_DRIVER: "systemd" @@ -102,10 +102,10 @@ voting: false - job: - name: kuryr-kubernetes-tempest-containerized-octavia-pools-namespace + name: kuryr-kubernetes-tempest-containerized-pools-namespace description: | - Tempest with Octavia, CNI daemon, containers, port pools and namespace subnet driver - parent: kuryr-kubernetes-tempest-containerized-octavia + Tempest with containers, port pools and namespace subnet driver + parent: kuryr-kubernetes-tempest-containerized vars: devstack_localrc: KURYR_SUBNET_DRIVER: namespace @@ -116,10 +116,10 @@ KURYR_VIF_POOL_DRIVER: neutron - job: - name: kuryr-kubernetes-tempest-containerized-octavia-network-policy + name: kuryr-kubernetes-tempest-containerized-network-policy description: | - Tempest with Octavia, CNI daemon, containers and network policy driver - parent: kuryr-kubernetes-tempest-containerized-octavia + Tempest with Octavia, containers and network policy driver + parent: kuryr-kubernetes-tempest-containerized vars: tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_network_policy.TestNetworkPolicyScenario)' devstack_localrc: @@ -129,10 +129,10 @@ voting: false - job: - name: kuryr-kubernetes-tempest-containerized-octavia-py36 + name: kuryr-kubernetes-tempest-containerized-py36 description: | - Tempest with Octavia and Kuryr running on Python3.6 containers - parent: kuryr-kubernetes-tempest-containerized-octavia + Tempest with Kuryr running on Python3.6 containers + parent: kuryr-kubernetes-tempest-containerized vars: devstack_localrc: KURYR_CONTAINERS_USE_PY3: True @@ -140,17 +140,17 @@ voting: true - job: - name: kuryr-kubernetes-tempest-containerized-openshift-octavia - description: Tempest with Octavia, containers and OpenShift - parent: kuryr-kubernetes-tempest-openshift-octavia + name: kuryr-kubernetes-tempest-containerized-openshift + description: Tempest with containers and OpenShift + parent: kuryr-kubernetes-tempest-openshift vars: devstack_localrc: KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true - job: - name: kuryr-kubernetes-tempest-containerized-openshift-octavia-serial - description: Tempest with Octavia running in serial, containers and OpenShift - parent: kuryr-kubernetes-tempest-containerized-openshift-octavia + name: kuryr-kubernetes-tempest-containerized-openshift-serial + description: Tempest running in serial, containers and OpenShift + parent: kuryr-kubernetes-tempest-containerized-openshift vars: devstack_localrc: KURYR_K8S_SERIAL_TESTS: True @@ -158,10 +158,10 @@ - job: - name: kuryr-kubernetes-tempest-openshift-octavia-ingress - parent: kuryr-kubernetes-tempest-openshift-octavia + name: kuryr-kubernetes-tempest-openshift-ingress + parent: kuryr-kubernetes-tempest-openshift description: | - Kuryr-Kubernetes tempest job using octavia, ingress controller and OpenShift + Kuryr-Kubernetes tempest job using ingress controller and OpenShift vars: devstack_localrc: KURYR_ENABLE_INGRESS: true @@ -169,8 +169,8 @@ voting: false - job: - name: kuryr-kubernetes-tempest-containerized-octavia-crio - parent: kuryr-kubernetes-tempest-containerized-octavia + name: kuryr-kubernetes-tempest-containerized-crio + parent: kuryr-kubernetes-tempest-containerized nodeset: openstack-single-node-bionic vars: devstack_localrc: diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 7fc0aeca5..9ec3e453e 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -16,32 +16,32 @@ name: kuryr-kubernetes-tempest-jobs check: jobs: - - kuryr-kubernetes-tempest-octavia - - kuryr-kubernetes-tempest-openshift-octavia - - kuryr-kubernetes-tempest-containerized-octavia + - kuryr-kubernetes-tempest + - kuryr-kubernetes-tempest-openshift + - kuryr-kubernetes-tempest-containerized - kuryr-kubernetes-tempest-containerized-ovn - - kuryr-kubernetes-tempest-octavia-py36 - - kuryr-kubernetes-tempest-containerized-octavia-py36 - - kuryr-kubernetes-tempest-multinode-octavia-containerized - - kuryr-kubernetes-tempest-octavia-centos-7 + - kuryr-kubernetes-tempest-py36 + - kuryr-kubernetes-tempest-containerized-py36 + - kuryr-kubernetes-tempest-multinode-containerized + - kuryr-kubernetes-tempest-centos-7 gate: jobs: - - kuryr-kubernetes-tempest-octavia - - kuryr-kubernetes-tempest-octavia-py36 - - kuryr-kubernetes-tempest-containerized-octavia-py36 + - kuryr-kubernetes-tempest + - kuryr-kubernetes-tempest-py36 + - kuryr-kubernetes-tempest-containerized-py36 experimental: jobs: - kuryr-kubernetes-tempest-dragonflow - - kuryr-kubernetes-tempest-containerized-openshift-octavia - - kuryr-kubernetes-tempest-containerized-octavia-l2 - - kuryr-kubernetes-tempest-containerized-octavia-pools-namespace - - kuryr-kubernetes-tempest-containerized-octavia-network-policy - - kuryr-kubernetes-tempest-containerized-openshift-octavia-serial + - kuryr-kubernetes-tempest-containerized-openshift + - kuryr-kubernetes-tempest-containerized-l2 + - kuryr-kubernetes-tempest-containerized-pools-namespace + - kuryr-kubernetes-tempest-containerized-network-policy + - kuryr-kubernetes-tempest-containerized-openshift-serial - kuryr-kubernetes-tempest-ovn - - kuryr-kubernetes-tempest-openshift-octavia-ingress - - kuryr-kubernetes-tempest-openshift-octavia-multi-vif - - kuryr-kubernetes-tempest-multinode-octavia-ha - - kuryr-kubernetes-tempest-containerized-octavia-crio + - kuryr-kubernetes-tempest-openshift-ingress + - kuryr-kubernetes-tempest-openshift-multi-vif + - kuryr-kubernetes-tempest-multinode-ha + - kuryr-kubernetes-tempest-containerized-crio - project: templates: diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml index 5c1fcb448..a7ed5cb16 100644 --- a/.zuul.d/sdn.yaml +++ b/.zuul.d/sdn.yaml @@ -14,7 +14,7 @@ - job: name: kuryr-kubernetes-tempest-ovn - parent: kuryr-kubernetes-tempest-octavia + parent: kuryr-kubernetes-tempest description: | Kuryr-Kubernetes tempest job using OVN required-projects: @@ -54,7 +54,7 @@ - job: name: kuryr-kubernetes-tempest-dragonflow - parent: kuryr-kubernetes-tempest-octavia + parent: kuryr-kubernetes-tempest description: | Kuryr-Kubernetes tempest job using Dragonflow required-projects: