Merge "CI: Remove ceph-base and remove file check from ceph-ansible-base"

zuul.d/base.yaml

@@ -36,20 +36,6 @@
     roles:
       - zuul: zuul/zuul-jobs
 
-- job:
-    name: kolla-ansible-ceph-base
-    parent: kolla-ansible-base
-    voting: false
-    vars:
-      scenario: ceph
-    host-vars:
-      primary:
-        ceph_osd_storetype: filestore
-      secondary1:
-        ceph_osd_storetype: bluestore
-      secondary2:
-        ceph_osd_storetype: bluestore
-
 - job:
     name: kolla-ansible-ipv6-base
     parent: kolla-ansible-base
@@ -113,9 +99,6 @@
     name: kolla-ansible-ceph-ansible-base
     parent: kolla-ansible-base
     voting: false
-    files:
-      - ^ansible/roles/(cinder|glance|gnocchi|nova-cell)/
-      - ^tests/deploy-ceph-ansible.sh
     vars:
       scenario: ceph-ansible
       ceph_osd_storetype: ceph-lvm

zuul.d/jobs.yaml

@@ -149,26 +149,6 @@
       install_type: source
       is_upgrade: yes
 
-- job:
-    name: kolla-ansible-ubuntu-source-upgrade-ceph
-    parent: kolla-ansible-ceph-base
-    nodeset: kolla-ansible-bionic-multi
-    timeout: 9000
-    vars:
-      base_distro: ubuntu
-      install_type: source
-      is_upgrade: yes
-
-- job:
-    name: kolla-ansible-centos-source-upgrade-ceph
-    parent: kolla-ansible-ceph-base
-    nodeset: kolla-ansible-centos-multi
-    timeout: 9000
-    vars:
-      base_distro: centos
-      install_type: source
-      is_upgrade: yes
-
 - job:
     name: kolla-ansible-ubuntu-source-upgrade-ceph-ansible
     parent: kolla-ansible-ceph-ansible-base