diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5827d5bd23afa9976d369b73c9b5cae8d046d311..e83d1288941ebf7584af4682359de619d1d14d60 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -15,15 +15,6 @@ base_distro: ubuntu install_type: source -- job: - name: kolla-ansible-oraclelinux-source - parent: kolla-ansible-base - nodeset: kolla-ansible-centos - voting: false - vars: - base_distro: oraclelinux - install_type: source - - job: name: kolla-ansible-centos-binary parent: kolla-ansible-base @@ -42,15 +33,6 @@ base_distro: ubuntu install_type: binary -- job: - name: kolla-ansible-oraclelinux-binary - parent: kolla-ansible-base - nodeset: kolla-ansible-centos - voting: false - vars: - base_distro: oraclelinux - install_type: binary - - job: name: kolla-ansible-ubuntu-source-ceph parent: kolla-ansible-base @@ -87,24 +69,6 @@ secondary2: ceph_osd_storetype: bluestore -- job: - name: kolla-ansible-oraclelinux-source-ceph - parent: kolla-ansible-base - nodeset: kolla-ansible-centos-multi - timeout: 9000 - voting: false - vars: - base_distro: oraclelinux - install_type: source - scenario: ceph - host-vars: - primary: - ceph_osd_storetype: filestore - secondary1: - ceph_osd_storetype: bluestore - secondary2: - ceph_osd_storetype: bluestore - - job: name: kolla-ansible-ubuntu-source-cinder-lvm parent: kolla-ansible-base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b90bd1fd2110f1600660f727a92ac7be25d74ec2..7fcc30ef22c5b17123b62b328bfea6cb42b7eabe 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -13,10 +13,8 @@ jobs: - kolla-ansible-centos-source - kolla-ansible-ubuntu-source - - kolla-ansible-oraclelinux-source - kolla-ansible-ubuntu-source-ceph - kolla-ansible-centos-source-ceph - - kolla-ansible-oraclelinux-source-ceph - kolla-ansible-ubuntu-source-cinder-lvm: files: ^ansible\/roles\/(cinder|iscsi)\/.* - kolla-ansible-centos-source-cinder-lvm: