summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-10-29 13:37:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-29 13:37:55 +0000
commite1cda14d7990bd7ea65c7952ed756976ce796544 (patch)
tree445822019dd9f0a602a43311ad7ae6d0ff3d5e89 /jjb/functest
parentefc5f89524b4e54ba303885398943a93652d3c63 (diff)
parent195ba4c975a8b307728f767aca8d2f9097e5ffcb (diff)
Merge "Write tempest_conf.yaml for all OPNFV installers"
Diffstat (limited to 'jjb/functest')
-rwxr-xr-xjjb/functest/functest-alpine.sh87
1 files changed, 82 insertions, 5 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index f0733b641..465d91efe 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -132,10 +132,6 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-if [[ "${INSTALLER_TYPE}" == 'apex' ]] || [[ "${INSTALLER_TYPE}" == 'compass' ]]; then
- envs="${envs} -e STORAGE_PROTOCOL=ceph"
-fi
-
if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
"sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
@@ -171,7 +167,88 @@ if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then
envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}"
fi
-volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
+tempest_conf_yaml=$(mktemp)
+case ${INSTALLER_TYPE} in
+apex)
+ cat << EOF > "${tempest_conf_yaml}"
+---
+compute-feature-enabled:
+ shelve: false
+ vnc_console: true
+identity-feature-enabled:
+ api_v2: false
+ api_v2_admin: false
+image-feature-enabled:
+ api_v2: true
+ api_v1: false
+volume:
+ storage_protocol: ceph
+volume-feature-enabled:
+ backup: false
+EOF
+ ;;
+compass)
+ cat << EOF > "${tempest_conf_yaml}"
+---
+compute-feature-enabled:
+ shelve: false
+ vnc_console: false
+ spice_console: true
+identity-feature-enabled:
+ api_v2: false
+ api_v2_admin: false
+image-feature-enabled:
+ api_v2: true
+ api_v1: false
+volume:
+ storage_protocol: ceph
+volume-feature-enabled:
+ backup: false
+EOF
+ ;;
+fuel)
+ cat << EOF > "${tempest_conf_yaml}"
+---
+compute-feature-enabled:
+ shelve: false
+ vnc_console: false
+ spice_console: true
+identity-feature-enabled:
+ api_v2: false
+ api_v2_admin: false
+image-feature-enabled:
+ api_v2: true
+ api_v1: false
+volume:
+ storage_protocol: iSCSI
+volume-feature-enabled:
+ backup: false
+EOF
+ ;;
+*)
+ cat << EOF > "${tempest_conf_yaml}"
+---
+compute-feature-enabled:
+ shelve: false
+ vnc_console: false
+identity-feature-enabled:
+ api_v2: false
+ api_v2_admin: false
+image-feature-enabled:
+ api_v2: true
+ api_v1: false
+volume:
+ storage_protocol: iSCSI
+volume-feature-enabled:
+ backup: false
+EOF
+ ;;
+esac
+echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}"
+
+volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \
+ ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \
+ -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml"
ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
echo 0 > ${ret_val_file}