From bc0a7121ef70052cc70a5c0b36266932f82e94ef Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Mon, 20 Mar 2017 10:33:42 +0100
Subject: multisite: Switch to latest fuel deploy and create danube jobs

Change-Id: I93339884bd604da2314e32dfe7cbf25b21c67537
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/multisite/fuel-deploy-for-multisite.sh |  8 ++++----
 jjb/multisite/multisite-daily-jobs.yml     | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'jjb/multisite')

diff --git a/jjb/multisite/fuel-deploy-for-multisite.sh b/jjb/multisite/fuel-deploy-for-multisite.sh
index 06617610c..71c6cc11d 100755
--- a/jjb/multisite/fuel-deploy-for-multisite.sh
+++ b/jjb/multisite/fuel-deploy-for-multisite.sh
@@ -19,9 +19,9 @@ else
 fi
 
 export TERM="vt220"
-
+export BRANCH=$(echo $BRANCH | sed 's/stable\///g')
 # get the latest successful job console log and extract the properties filename
-FUEL_DEPLOY_BUILD_URL="https://build.opnfv.org/ci/job/fuel-deploy-virtual-daily-master/lastSuccessfulBuild/consoleText"
+FUEL_DEPLOY_BUILD_URL="https://build.opnfv.org/ci/job/fuel-deploy-virtual-daily-$BRANCH/lastSuccessfulBuild/consoleText"
 FUEL_PROPERTIES_FILE=$(curl -s -L ${FUEL_DEPLOY_BUILD_URL} | grep 'ISO:' | awk '{print $2}' | sed 's/iso/properties/g')
 if [[ -z "FUEL_PROPERTIES_FILE" ]]; then
     echo "Unable to extract the url to Fuel ISO properties from ${FUEL_DEPLOY_URL}"
@@ -29,8 +29,8 @@ if [[ -z "FUEL_PROPERTIES_FILE" ]]; then
 fi
 
 # use known/working version of fuel
-FUEL_PROPERTIES_FILE="opnfv-2017-03-06_16-00-15.properties"
-curl -L -s -o $WORKSPACE/latest.properties http://artifacts.opnfv.org/fuel/$FUEL_PROPERTIES_FILE
+#FUEL_PROPERTIES_FILE="opnfv-2017-03-06_16-00-15.properties"
+curl -L -s -o $WORKSPACE/latest.properties $GS_PATH/$FUEL_PROPERTIES_FILE
 
 # source the file so we get OPNFV vars
 source latest.properties
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index 23c95f627..f2d05eba8 100644
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -24,7 +24,12 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-            timed: '@midnight'
+            timed: '0 12 * * *'
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
+            timed: '0 0 * * *'
 
 - job-template:
     name: 'multisite-kingbird-virtual-daily-{stream}'
@@ -47,6 +52,9 @@
         - string:
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
+        - string:
+            name: GS_PATH
+            default: 'http://artifacts.opnfv.org/fuel{gs-pathname}'
         - 'opnfv-build-defaults'
 
     triggers:
-- 
cgit 1.2.3-korg