diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index f0659bd68..e5ce73c00 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -85,34 +85,6 @@ dib_functests: - ubuntu-minimal/bionic-arm64-build-succeeds -# Trusty / Python 2 tests -- job: - name: dib-functests-trusty-python2 - description: | - Run the default tests on a Trusty build host with Python 2 - parent: dib-functests-default - nodeset: ubuntu-trusty - vars: - dib_python: python2 - -- job: - name: dib-functests-trusty-python2-image - description: | - The image tests on a Trusty build host with Python 2 - parent: dib-functests-image - nodeset: ubuntu-trusty - vars: - dib_python: python2 - -- job: - name: dib-functests-trusty-python2-extras - description: | - The extras tests on a Trusty build host with Python 2 - parent: dib-functests-extras - nodeset: ubuntu-trusty - vars: - dib_python: python2 - # Bionic / Python3 tests - job: name: dib-functests-bionic-python3 @@ -281,21 +253,6 @@ base_element: fedora-minimal release: '30' -- job: - name: dib-nodepool-functional-openstack-ubuntu-trusty-src - description: | - Test building and booting an Ubuntu trusty image with Nodepool - and OpenStack - parent: dib-nodepool-functional-src-base - pre-run: playbooks/dib-nodepool/debootstrap.yaml - vars: - nodepool_extra_packages: - - debootstrap - nodepool_diskimage: - base_element: ubuntu-minimal - release: 'trusty' - mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu" - - job: name: dib-nodepool-functional-openstack-ubuntu-xenial-src description: | diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 77c5e5af4..bd0c803fc 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -14,16 +14,12 @@ - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-fedora-29-src - dib-nodepool-functional-openstack-fedora-30-src - - dib-nodepool-functional-openstack-ubuntu-trusty-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic - dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-functests-centos7-python2 - dib-functests-centos7-python2-image - dib-functests-centos7-python2-extras - - dib-functests-trusty-python2 - - dib-functests-trusty-python2-image - - dib-functests-trusty-python2-extras - dib-functests-xenial-python3 - dib-functests-xenial-python3-image - dib-functests-xenial-python3-extras @@ -42,11 +38,9 @@ - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-fedora-29-src - dib-nodepool-functional-openstack-fedora-30-src - - dib-nodepool-functional-openstack-ubuntu-trusty-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic - dib-nodepool-functional-openstack-ubuntu-bionic-src - - dib-functests-trusty-python2 - dib-functests-xenial-python3 - dib-functests-centos7-python2 experimental: