diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6dead1ace2..5b51659ad9 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,33 +1,3 @@ -- job: - name: publish-openstack-octavia-amphora-image - parent: publish-openstack-artifacts - run: playbooks/image-build/run.yaml - post-run: playbooks/image-build/post.yaml - required-projects: - - openstack/diskimage-builder - - openstack/octavia - - openstack/octavia-lib - -- job: - name: publish-openstack-octavia-amphora-image-focal - parent: publish-openstack-octavia-amphora-image - nodeset: ubuntu-focal - description: | - Publish Ubuntu Focal (20.04) based amphora image to tarballs.o.o. - vars: - amphora_os: ubuntu - amphora_os_release: focal - -- job: - name: publish-openstack-octavia-amphora-image-centos-8-stream - nodeset: centos-8-stream - parent: publish-openstack-octavia-amphora-image - description: | - Publish CentOS 8 Stream based amphora image to tarballs.o.o. - vars: - amphora_os: centos - amphora_os_release: 8-stream - - job: name: octavia-grenade parent: grenade @@ -164,19 +134,6 @@ required-projects: - openstack/diskimage-builder -- job: - name: octavia-amphora-image-build-live-centos-8-stream - parent: octavia-amphora-image-build - nodeset: centos-8-stream - description: | - Builds a CentOS 8 Stream amphora image using diskimage-builder from Git - master. This job does not publish the image. - required-projects: - - openstack/diskimage-builder - vars: - amphora_os: centos - amphora_os_release: 8-stream - - job: name: octavia-v2-dsvm-scenario-nftables parent: octavia-v2-dsvm-scenario diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 6752a79fe4..c23dbf2da6 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -99,10 +99,6 @@ - octavia-grenade periodic: jobs: - - publish-openstack-octavia-amphora-image-focal: - branches: ^(?!stable/.*).*$ - - publish-openstack-octavia-amphora-image-centos-8-stream: - branches: ^(?!stable/.*).*$ - octavia-amphora-image-build - octavia-grenade-ffu # Putting octavia-v2-dsvm-scenario-fips in periodic as centos 8 is too slow