Enable fuel verify job on stable/arno

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

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 909dc1b..656f6ca 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -10,23 +10,27 @@
     installer: 'fuel'
 
     jobs:
-        - 'genesis-fuel-verify'
+        - 'genesis-fuel-verify-{stream}'
         - 'genesis-fuel-merge'
-        - 'genesis-fuel-daily-{stream}'
+        - 'genesis-fuel-daily-master'
         - 'genesis-fuel-build'
         - 'genesis-fuel-deploy'
         - 'genesis-fuel-deploy-virtual'
 
+    # stream:    branch with - in place of / (eg. stable-arno)
+    # branch:    branch (eg. stable/arno)
     stream:
         - master:
             branch: 'master'
+        - stable-arno:
+            branch: 'stable/arno'
 
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'genesis-fuel-verify'
+    name: 'genesis-fuel-verify-{stream}'
 
     project-type: freestyle
 
@@ -49,7 +53,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - fuel-parameter:
             installer: '{installer}'
 
@@ -80,7 +84,7 @@
                 project-pattern: 'genesis'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'common/**'
@@ -152,7 +156,7 @@
         - 'fuel-workspace-cleanup'
 
 - job-template:
-    name: 'genesis-fuel-daily-{stream}'
+    name: 'genesis-fuel-daily-master'
 
     project-type: freestyle
 
@@ -172,9 +176,6 @@
             refspec: ''
             branch: master
 
-    triggers:
-        - timed: '@midnight'
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -186,10 +187,6 @@
           - project: 'genesis-fuel-build'
             git-revision: true
             block: true
-        - trigger-builds:
-          - project: 'genesis-fuel-deploy-virtual'
-            git-revision: true
-            block: false
         - trigger-builds:
           - project: 'genesis-fuel-deploy'
             git-revision: true
@@ -268,7 +265,7 @@
 
     project-type: freestyle
 
-    disabled: false
+    disabled: true
 
     node: ericsson-build
 
@@ -373,15 +370,20 @@
             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 +393,9 @@
             echo
 
             # start the deployment
-            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_no-ha.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml"
+            sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea_no-ha.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml
 
             echo
             echo "--------------------------------------------------------"