From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Wed, 1 Aug 2018 06:40:14 +0000 (+0000)
Subject: Merge "prepare installer info for doctor test"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f1798a4fa7145e37184bad8d282b49a922df21b4;hp=09cfb60453d9cfa317c5e5d317c48823d23c6258;p=releng.git

Merge "prepare installer info for doctor test"
---

diff --git a/jjb/doctor/doctor-env-presetup.sh b/jjb/doctor/doctor-env-presetup.sh
index 2dda71f3c..8c7c12e25 100755
--- a/jjb/doctor/doctor-env-presetup.sh
+++ b/jjb/doctor/doctor-env-presetup.sh
@@ -2,6 +2,10 @@
 set -o errexit
 set -o pipefail
 
+# set vars from env if not provided by user as options
+installer_key_file=${installer_key_file:-$HOME/installer_key_file}
+opnfv_installer=${opnfv_installer:-$HOME/opnfv-installer.sh}
+
 # Fetch INSTALLER_IP for APEX deployments
 if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
 
@@ -18,6 +22,9 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
         exit 1
     fi
 
+    sudo cp /root/.ssh/id_rsa ${installer_key_file}
+    sudo chown `whoami`:`whoami` ${installer_key_file}
+
 elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then
     echo "Gathering IP information for Daisy installer VM"
     if sudo virsh list | grep daisy; then
@@ -37,3 +44,17 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then
     fi
 fi
 
+
+# Checking if destination path is valid
+if [ -d $opnfv_installer ]; then
+    error "Please provide the full destination path for the installer ip file including the filename"
+else
+    # Check if we can create the file (e.g. path is correct)
+    touch $opnfv_installer || error "Cannot create the file specified. Check that the path is correct and run the script again."
+fi
+
+
+# Write the installer info to the file
+echo export INSTALLER_TYPE=${INSTALLER_TYPE} > $opnfv_installer
+echo export INSTALLER_IP=${INSTALLER_IP} >> $opnfv_installer
+echo export SSH_KEY=${installer_key_file} >> $opnfv_installer
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 13cf1a227..858fb5f4e 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -153,11 +153,14 @@
               - ./doctor-env-presetup.sh
               - ../../utils/fetch_os_creds.sh
       - shell: |
+          # prepare the env for test
           source $HOME/opnfv-openrc.sh
           if [ -f $HOME/os_cacert ]; then
               export OS_CACERT=$HOME/os_cacert
           fi
+          source $HOME/opnfv-installer.sh
 
+          # run tox to trigger the test
           tox -e py34
 
 # -------------------------------