From 9abc09bcd2ed77ee517159c688fd9f6aff445e23 Mon Sep 17 00:00:00 2001 From: jinyuanliu Date: Sun, 17 Oct 2021 02:16:17 -0400 Subject: [PATCH] Fix helm test method about ceph-radosgateway This patch makes the helm test command more standard by calling script of common. Change-Id: I5a19cd9b94a405e0c1e55a7e009aaf9b46878a1c --- tools/deployment/multinode/090-ceph-radosgateway.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh index bca85a79ad..ad3f416e77 100755 --- a/tools/deployment/multinode/090-ceph-radosgateway.sh +++ b/tools/deployment/multinode/090-ceph-radosgateway.sh @@ -17,6 +17,7 @@ set -xe #NOTE: Get the over-rides to use export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" : ${OSH_EXTRA_HELM_ARGS_CEPH_RGW:="$(./tools/deployment/common/get-values-overrides.sh ceph-rgw)"} +: ${RUN_HELM_TESTS:="yes"} #NOTE: Lint and package chart make -C ${HELM_CHART_ROOT_PATH} ceph-rgw @@ -58,8 +59,7 @@ helm upgrade --install radosgw-openstack ${OSH_INFRA_PATH}/ceph-rgw \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Run Tests -export OS_CLOUD=openstack_helm -# Delete the test pod if it still exists -kubectl delete pods -l application=radosgw-openstack,release_group=radosgw-openstack,component=test --namespace=openstack --ignore-not-found -helm test radosgw-openstack +# Run helm tests +if [ "x${RUN_HELM_TESTS}" != "xno" ]; then + ./tools/deployment/common/run-helm-tests.sh radosgw-openstack +fi