diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index d4caf992..4c63ef80 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -42,18 +42,6 @@ OVN_BRANCH: v21.06.0 OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87" -- job: - name: ovn-octavia-provider-functional-master - parent: ovn-octavia-provider-functional-base - description: Run OVN Octavia provider functional tests - OVN master - vars: - OVN_BUILD_FROM_SOURCE: True - Q_BUILD_OVS_FROM_GIT: True - INSTALL_OVN: True - OVN_BRANCH: main - # NOTE(froyo): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.3 - - job: name: ovn-octavia-provider-tempest-base parent: devstack-tempest @@ -167,15 +155,3 @@ INSTALL_OVN: True OVN_BRANCH: v21.06.0 OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87" - -- job: - name: ovn-octavia-provider-tempest-master - parent: ovn-octavia-provider-tempest-base - vars: - devstack_localrc: - OVN_BUILD_FROM_SOURCE: True - Q_BUILD_OVS_FROM_GIT: True - INSTALL_OVN: True - OVN_BRANCH: main - # NOTE(froyo): OVN main branch following OVS stable branch - OVS_BRANCH: branch-3.3 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index a3a77069..c4161e82 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -11,15 +11,11 @@ required-projects: - openstack/neutron - ovn-octavia-provider-functional-release - - ovn-octavia-provider-functional-master - ovn-octavia-provider-tempest-release - - ovn-octavia-provider-tempest-master: - voting: false - kuryr-kubernetes-tempest-ovn-provider-ovn: voting: false gate: fail-fast: true jobs: - ovn-octavia-provider-functional-release - - ovn-octavia-provider-functional-master - ovn-octavia-provider-tempest-release