From 24e8d657113b200906705db21be10b69677bdf2f Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 13 Feb 2020 15:34:42 +0100 Subject: [PATCH] CI: Remove ceph-base and remove file check from ceph-ansible-base Change-Id: I2c20bfda66996b58760f24bf4c41122874d27b41 --- zuul.d/base.yaml | 17 ----------------- zuul.d/jobs.yaml | 20 -------------------- 2 files changed, 37 deletions(-) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index ddac44407f..7c84d32bd5 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -35,20 +35,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 @@ -112,9 +98,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 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 43ccddeb9c..429eec1d2d 100644 --- a/zuul.d/jobs.yaml +++ b/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