Fuel: Enable the jobs for newly added scenarios

Change-Id: Id587f14e6b3bee67558b46b3ea0e262461fbef3e
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/fuel/fuel-ci-jobs-master.yml b/jjb/fuel/fuel-ci-jobs-master.yml
index f69827e..18d31c1 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs-master.yml
+++ b/jjb/fuel/fuel-ci-jobs-master.yml
@@ -43,8 +43,6 @@
 
     project-type: multijob
 
-    disabled: '{obj:disabled}'
-
     concurrent: false
 
     properties:

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 3a6213c..8b4f110 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -36,8 +36,7 @@
 
 # please check the triggers before enabling any of the controllers!!!
     sdn-controller:
-        - 'nosdn':
-            disabled: false
+        - 'nosdn'
 
     jobs:
         - 'fuel-{sdn-controller}-{pod}-daily-{stream}'
@@ -51,8 +50,6 @@
 
     project-type: multijob
 
-    disabled: '{obj:disabled}'
-
     concurrent: false
 
     properties:
@@ -172,16 +169,16 @@
     name: 'builder-master'
     builders:
         - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
+            !include-raw: ./fuel-download-artifact.sh
         - shell:
-            !include-raw-escape: ./fuel-deploy-master.sh
+            !include-raw: ./fuel-deploy-master.sh
 - builder:
     name: 'builder-brahmaputra'
     builders:
         - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
+            !include-raw: ./fuel-download-artifact.sh
         - shell:
-            !include-raw-escape: ./fuel-deploy.sh
+            !include-raw: ./fuel-deploy.sh
 ########################
 # trigger macros
 ########################

diff --git a/jjb/fuel/fuel-deploy-master.sh b/jjb/fuel/fuel-deploy-master.sh
index bdb4ed3..4a7d1d9 100755 (executable)
--- a/jjb/fuel/fuel-deploy-master.sh
+++ b/jjb/fuel/fuel-deploy-master.sh
@@ -7,7 +7,7 @@ set -o pipefail
 source latest.properties
 
 # echo the info about artifact that is used during the deployment
-echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment"
+echo "Using $OPNFV_ARTIFACT_URL for deployment"
 
 # checkout the commit that was used for building the downloaded artifact
 # to make sure the ISO and deployment mechanism uses same versions

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index f31aa95..dc3d81a 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -7,7 +7,7 @@ set -o pipefail
 source latest.properties
 
 # echo the info about artifact that is used during the deployment
-echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment"
+echo "Using $OPNFV_ARTIFACT_URL for deployment"
 
 # checkout the commit that was used for building the downloaded artifact
 # to make sure the ISO and deployment mechanism uses same versions