Fix tmpdir for fuel deployment job in Jenkins

[releng.git] / jjb / genesis / genesis-fuel.yml

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 3199867..3d659f7 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -244,7 +244,7 @@
             installer: '{installer}'
         - string:
             name: GIT_BASE
-            default: ssh://gerrit.opnfv.org/gerrit/$PROJECT
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
             description: "POD1 has some issues with cloning using https so that's why GIT_BASE is overriden here again."
 
     scm:
@@ -350,9 +350,6 @@
             # list the build artifacts
             ls -al $BUILD_DIRECTORY
 
-            # list the contents of BUILD_OUTPUT directory
-            ls -al $BUILD_DIRECTORY
-
             # save information regarding artifact into file
             (
                 echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
@@ -376,12 +373,23 @@
             set -o nounset
             set -o pipefail
 
+            # remove the fuel master ssh key from $HOME/.ssh/known_hosts
+            ssh-keygen -R 172.30.200.206
+
             # source the file so we get OPNFV vars
             source latest.properties
 
             # echo the info about artifact that is used during the deployment
             echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f4) for deployment"
 
+            # create TMPDIR if it doesn't exist
+            export TMPDIR=$HOME/tmpdir
+            [[ -d $TMPDIR ]] || mkdir -p $TMPDIR
+
+            # change permissions down to TMPDIR
+            chmod a+x $HOME
+            chmod a+x $TMPDIR
+
             # set TOPDIR
             export TOPDIR=$WORKSPACE/fuel/prototypes/auto-deploy
 
@@ -391,7 +399,9 @@
             echo
 
             # start the deployment
-            echo "sudo  ${TOPDIR}/deploy/deploy.sh $WORKSPACE/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml"
+            echo "Issuing command"
+            echo "sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml"
+            sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml
 
             echo
             echo "--------------------------------------------------------"
@@ -458,7 +468,7 @@
             echo
 
             # get the latest.properties file in order to get info regarding latest artifact
-            gsutil cp gs://$GS_URL/latest.properties $WORKSPACE/latest.properties
+            curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
 
             # check if we got the file
             [[ -f latest.properties ]] || exit 1
@@ -467,7 +477,7 @@
             source latest.properties
 
             # download the file
-            gsutil cp gs://$OPNFV_ARTIFACT_URL $WORKSPACE/opnfv.iso > gsutil.iso.log 2>&1
+            curl -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
 
             # list the file
             ls -al $WORKSPACE/opnfv.iso