Merge "Fix helm test method about compute-kit"
This commit is contained in:
commit
5d028cd421
@ -15,6 +15,7 @@ set -xe
|
|||||||
|
|
||||||
stages="prepare deploy checkdns setupdns"
|
stages="prepare deploy checkdns setupdns"
|
||||||
OSH_INFRA_PATH=${OSH_INFRA_PATH:="../openstack-helm-infra"}
|
OSH_INFRA_PATH=${OSH_INFRA_PATH:="../openstack-helm-infra"}
|
||||||
|
: ${RUN_HELM_TESTS:="yes"}
|
||||||
|
|
||||||
function get_node_ip() {
|
function get_node_ip() {
|
||||||
local phys_int=$(ip route get 1 | grep -o 'dev.*' | awk '{print($2)}')
|
local phys_int=$(ip route get 1 | grep -o 'dev.*' | awk '{print($2)}')
|
||||||
@ -227,11 +228,10 @@ EOF
|
|||||||
# run couple of openstack commands and nova tests
|
# run couple of openstack commands and nova tests
|
||||||
openstack compute service list
|
openstack compute service list
|
||||||
openstack hypervisor list
|
openstack hypervisor list
|
||||||
if [ "x${RUN_HELM_TESTS}" == "xno" ]; then
|
if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
|
||||||
exit 0
|
./tools/deployment/common/run-helm-tests.sh nova
|
||||||
|
./tools/deployment/common/run-helm-tests.sh neutron
|
||||||
fi
|
fi
|
||||||
helm test nova --timeout 900
|
|
||||||
helm test neutron --timeout 900
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ $# == 0 ]] ; then
|
if [[ $# == 0 ]] ; then
|
||||||
@ -246,4 +246,4 @@ if [[ ! $stages =~ .*${1}.* ]] ; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${1}_tf
|
${1}_tf
|
||||||
|
Loading…
x
Reference in New Issue
Block a user