Merge "Enable QTIP container for docker build and push jjob"

diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index 6ccfb6f..d6a71e0 100755 (executable)
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -5,16 +5,20 @@ set -o pipefail
 
 cd $WORKSPACE
 
-# check to see if we already have an artifact on artifacts.opnfv.org
-# for this commit
-echo "Checking to see if we already built and stored Fuel ISO for this commit"
-
 LATEST_ISO_PROPERTIES=$WORKSPACE/latest.iso.properties
-curl -s -o $LATEST_ISO_PROPERTIES http://$GS_URL/latest.properties 2>/dev/null
+if [[ "$JOB_NAME" =~ "daily" ]]; then
+    # check to see if we already have an artifact on artifacts.opnfv.org
+    # for this commit during daily builds
+    echo "Checking to see if we already built and stored Fuel ISO for this commit"
+
+    curl -s -o $LATEST_ISO_PROPERTIES http://$GS_URL/latest.properties 2>/dev/null
 
-# get metadata of latest ISO
-LATEST_ISO_SHA1=$(grep OPNFV_GIT_SHA1 $LATEST_ISO_PROPERTIES | cut -d'=' -f2)
-LATEST_ISO_URL=$(grep OPNFV_ARTIFACT_URL $LATEST_ISO_PROPERTIES | cut -d'=' -f2)
+    # get metadata of latest ISO
+    LATEST_ISO_SHA1=$(grep OPNFV_GIT_SHA1 $LATEST_ISO_PROPERTIES | cut -d'=' -f2)
+    LATEST_ISO_URL=$(grep OPNFV_ARTIFACT_URL $LATEST_ISO_PROPERTIES | cut -d'=' -f2)
+else
+    LATEST_ISO_SHA1=none
+fi
 
 # get current SHA1
 CURRENT_SHA1=$(git rev-parse HEAD)

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index fa0f666..bcc3248 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -68,6 +68,12 @@
 
     concurrent: false
 
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE'
@@ -129,6 +135,14 @@
 - job-template:
     name: 'fuel-build-{pod}-daily-{stream}'
 
+    concurrent: false
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -163,6 +177,14 @@
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
 
+    concurrent: false
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
     parameters:
         - project-parameter:
             project: '{project}'