From 4aa0945c1dabd3ea81975853202c8a04c0808748 Mon Sep 17 00:00:00 2001 From: whhan91 Date: Mon, 29 Jul 2019 12:00:42 +0000 Subject: [PATCH] [CI] Enable glusterfs-nfs ci - Change post_test_hook in the gluster CI takes arguments - Enable glusterfs-nfs CI Depends-On: https://review.opendev.org/#/c/674738/ Change-Id: If6d233ffd658cd75599eec36eb8027f35771e224 --- .zuul.yaml | 3 ++- .../manila-tempest-dsvm-glusterfs-native-heketi/run.yaml | 5 ++++- .../legacy/manila-tempest-dsvm-glusterfs-native/run.yaml | 5 ++++- .../legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml | 5 ++++- playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml | 5 ++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 743f96e851..c9b6355697 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -27,6 +27,8 @@ voting: false - manila-tempest-minimal-dsvm-cephfs-nfs: voting: false + - manila-tempest-dsvm-glusterfs-nfs: + voting: false - manila-tempest-minimal-dsvm-dummy # Through the Train release we need to keep some python2 coverage. - manila-tempest-minimal-dsvm-dummy-py2 @@ -50,7 +52,6 @@ - manila-tempest-minimal-dsvm-lvm experimental: jobs: - - manila-tempest-dsvm-glusterfs-nfs - manila-tempest-dsvm-glusterfs-native - manila-tempest-dsvm-glusterfs-nfs-heketi - manila-tempest-dsvm-glusterfs-native-heketi diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml index be5f447ecd..1c9c66cde2 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml @@ -69,7 +69,10 @@ function post_test_hook { # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend + source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ + singlebackend \ + glusterfs-heketi \ + api } export -f post_test_hook diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml index 75a80bd515..077366080a 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml @@ -69,7 +69,10 @@ function post_test_hook { # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend + source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ + singlebackend \ + glusterfs-native \ + api } export -f post_test_hook diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml index cf62df51d2..5ef8d622e5 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml @@ -70,7 +70,10 @@ function post_test_hook { # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend + source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ + singlebackend \ + glusterfs-nfs-heketi \ + api } export -f post_test_hook diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml index ffe121fb52..bf564bd8f7 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml @@ -69,7 +69,10 @@ function post_test_hook { # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend + source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ + singlebackend \ + glusterfs-nfs \ + api } export -f post_test_hook