Fix si-tests helm cmd and voltype customize
Related-PROD: PROD-36856
Change-Id: Ie9cec8768eac913c168224321db82a27310b7117
diff --git a/k8s/workspace/init-workspace.sh b/k8s/workspace/init-workspace.sh
index 198784e..84ab960 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -105,13 +105,23 @@
ewriteln "export HELM_BINARY_PATH=$(which helm)"
echo " "
- echo "# Extracting network"
keystone_pod=$(kubectl --kubeconfig $MY_PROJFOLDER/envs/mos-kubeconfig.yaml get pod -n openstack -o=custom-columns=NAME:.metadata.name | grep keystone-client)
+ echo "# Extracting network"
cmd="openstack network list --external -c Name -f value"
echo "# Running 'kubectl --kubeconfig $MY_PROJFOLDER/envs/mos-kubeconfig.yaml -n openstack exec ${keystone_pod} -c keystone-client --stdin -- "${cmd}"'"
vPUBNET=$(kubectl --kubeconfig $MY_PROJFOLDER/envs/mos-kubeconfig.yaml -n openstack exec ${keystone_pod} -c keystone-client --stdin -- ${cmd})
echo "-> 'openstack network list --external -c Name -f value': '${vPUBNET}'"
ewriteln "export TEMPEST_CUSTOM_PUBLIC_NET=${vPUBNET}"
+
+ echo "# Extracting volume types"
+ cmd_all="openstack volume type list -f value -c Name"
+ vVOLTYPES=( $(kubectl --kubeconfig $MY_PROJFOLDER/envs/mos-kubeconfig.yaml -n openstack exec ${keystone_pod} -c keystone-client --stdin -- ${cmd_all}) )
+ echo "# Volume types available: ${vVOLTYPES[@]}"
+ cmd_default="openstack volume type list -f value -c Name --default"
+ vVOLTYPE=$(kubectl --kubeconfig $MY_PROJFOLDER/envs/mos-kubeconfig.yaml -n openstack exec ${keystone_pod} -c keystone-client --stdin -- ${cmd_default})
+ echo "# Default volume type used: ${vVOLTYPE}"
+ ewriteln "export TEMPEST_CUSTOM_VOLUME_TYPE=${vVOLTYPE}"
+ # hardcoded values
ewriteln "export TEMPEST_CUSTOM_FLAVOR=cvp.tiny"
ewriteln "export TEMPEST_CUSTOM_IMAGE=cvp.cirros.51"
ewriteln "export TEMPEST_CUSTOM_IMAGE_ALT=cvp.cirros.52"
diff --git a/k8s/workspace/update-openstack-resources.sh b/k8s/workspace/update-openstack-resources.sh
index e7543b1..23f9c21 100644
--- a/k8s/workspace/update-openstack-resources.sh
+++ b/k8s/workspace/update-openstack-resources.sh
@@ -44,6 +44,8 @@
sed -i "s/public_net_uuid/${netid}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
echo "# s/public_net_name/ -> ${TEMPEST_CUSTOM_PUBLIC_NET}"
sed -i "s/public_net_name/${TEMPEST_CUSTOM_PUBLIC_NET}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
+echo "# s/volume_type_name/ -> ${TEMPEST_CUSTOM_VOLUME_TYPE}"
+sed -i "s/volume_type_name/${TEMPEST_CUSTOM_VOLUME_TYPE}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
echo " "
echo "# Updating SPT global_config.yaml"