From e5e336f8343202a52c8158be4f04927d7745a37f Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Mon, 25 Feb 2019 10:48:58 -0500 Subject: [PATCH] Use legacy base to run CI/CD on Bionic legacy-dsvm-base now [1] runs with bionic nodeset so use it directly instead of overriding locally to use bionic. [1] https://review.openstack.org/#/c/639096/ Change-Id: I2a136f84e7d5d5be8a23830c0b334dc609092004 --- .zuul.yaml | 3 --- playbooks/legacy/grenade-dsvm-manila/post.yaml | 2 +- .../post.yaml | 2 +- .../manila-tempest-dsvm-generic-no-share-servers/post.yaml | 2 +- .../post.yaml | 2 +- .../manila-tempest-dsvm-glusterfs-native-heketi/post.yaml | 2 +- .../legacy/manila-tempest-dsvm-glusterfs-native/post.yaml | 2 +- .../legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml | 2 +- playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml | 2 +- playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml | 2 +- playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml | 2 +- .../legacy/manila-tempest-dsvm-postgres-container/post.yaml | 2 +- .../post.yaml | 2 +- .../legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml | 2 +- playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml | 2 +- .../legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml | 2 +- .../legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml | 2 +- playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml | 2 +- playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml | 2 +- .../legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml | 2 +- playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml | 2 +- 21 files changed, 20 insertions(+), 23 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 23373233e0..52bfc5b968 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -59,7 +59,6 @@ - job: name: manila-tempest-base parent: legacy-dsvm-base - nodeset: openstack-single-node-bionic timeout: 7200 irrelevant-files: - ^(test-|)requirements.txt$ @@ -380,7 +379,6 @@ - job: name: manila-rally-multibackend parent: legacy-dsvm-base - nodeset: openstack-single-node-bionic run: playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml post-run: playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml timeout: 4200 @@ -403,7 +401,6 @@ - job: name: manila-rally-multibackend-no-ss parent: legacy-dsvm-base - nodeset: openstack-single-node-bionic run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml post-run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml timeout: 4200 diff --git a/playbooks/legacy/grenade-dsvm-manila/post.yaml b/playbooks/legacy/grenade-dsvm-manila/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/grenade-dsvm-manila/post.yaml +++ b/playbooks/legacy/grenade-dsvm-manila/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml index e9b9d7f3a6..e07f5510ae 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml index 2c186e1afc..4c699fc12a 100644 --- a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml +++ b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml index 2c186e1afc..4c699fc12a 100644 --- a/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml +++ b/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml @@ -1,4 +1,4 @@ -- hosts: controller +- hosts: primary tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node