openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Clean up unused and duplicated jobs"

Browse Source
This commit is contained in:
Zuul
2022-07-21 13:11:05 +00:00
committed by Gerrit Code Review
parent af00740229 6aed6916a2
commit e6e91c531e
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.d/base.yaml
View File

@@ -108,7 +108,6 @@
- tag-ports-during-bulk-creation - tag-ports-during-bulk-creation
devstack_localrc: devstack_localrc:
KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
KURYR_ENFORCE_SG_RULES: false
ML2_L3_PLUGIN: ovn-router,trunk,qos ML2_L3_PLUGIN: ovn-router,trunk,qos
OVN_BRANCH: v21.06.0 OVN_BRANCH: v21.06.0
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87" OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
@@ -174,7 +173,7 @@
name: kuryr-kubernetes-octavia-base name: kuryr-kubernetes-octavia-base
parent: kuryr-kubernetes-base-ovn parent: kuryr-kubernetes-base-ovn
description: | description: |
Kuryr-Kubernetes tempest job using octavia Kuryr-Kubernetes tempest job using OVN and ovn-octavia driver for Kuryr
required-projects: required-projects:
- openstack/octavia - openstack/octavia
- openstack/python-octaviaclient - openstack/python-octaviaclient
@@ -193,6 +192,7 @@
- octavia-tempest-plugin - octavia-tempest-plugin
devstack_localrc: devstack_localrc:
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
KURYR_ENFORCE_SG_RULES: false
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2 KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
KURYR_LB_ALGORITHM: SOURCE_IP_PORT KURYR_LB_ALGORITHM: SOURCE_IP_PORT
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2 OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
@@ -222,7 +222,7 @@
parent: kuryr-kubernetes-base-ovs parent: kuryr-kubernetes-base-ovs
nodeset: kuryr-nested-virt-ubuntu-focal nodeset: kuryr-nested-virt-ubuntu-focal
description: | description: |
Kuryr-Kubernetes tempest job using octavia Kuryr-Kubernetes tempest job using OVS and amphora driver for Octavia
required-projects: required-projects:
- openstack/octavia - openstack/octavia
- openstack/python-octaviaclient - openstack/python-octaviaclient

1
.zuul.d/project.yaml
View File

@@ -33,7 +33,6 @@
- kuryr-kubernetes-tempest-systemd - kuryr-kubernetes-tempest-systemd
experimental: experimental:
jobs: jobs:
- kuryr-kubernetes-tempest-l2
- kuryr-kubernetes-tempest-pools-namespace - kuryr-kubernetes-tempest-pools-namespace
- kuryr-kubernetes-tempest-multinode-ha - kuryr-kubernetes-tempest-multinode-ha
- kuryr-kubernetes-tempest-dual-stack - kuryr-kubernetes-tempest-dual-stack

20
.zuul.d/tempest-jobs.yaml
View File

@@ -152,26 +152,6 @@
KURYR_DUAL_STACK: true KURYR_DUAL_STACK: true
voting: false voting: false
- job:
name: kuryr-kubernetes-tempest-lower-constraints
parent: kuryr-kubernetes-octavia-base
description: |
Kuryr-Kubernetes tempest job running kuryr containerized with
requirments from lower-constraints.txt
vars:
devstack_localrc:
KURYR_CONTAINERS_USE_LOWER_CONSTRAINTS: true
voting: false
- job:
name: kuryr-kubernetes-tempest-l2
parent: kuryr-kubernetes-octavia-base
description: |
Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized
vars:
devstack_localrc:
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
- job: - job:
name: kuryr-kubernetes-tempest-pools-namespace name: kuryr-kubernetes-tempest-pools-namespace
parent: kuryr-kubernetes-octavia-base parent: kuryr-kubernetes-octavia-base