X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=42bf60b0a1e789f6d455a68d7d43a3e8edce40e0;hb=4dc709177cdd7a78aa826c6764ea30a65a1c5b78;hp=f0733b6412e22a4df50f4deb610dac6d271654a1;hpb=d5cce0e2a7d4d75c8c056651ab5f2a36454a8145;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index f0733b641..42bf60b0a 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}'")
@@ -158,6 +154,10 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
     envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}"
 fi
 
+if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then
+      envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080"
+fi
+
 if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then
     if [[ -n ${IMAGE_PROPERTIES} ]]; then
         IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large"
@@ -171,7 +171,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}