X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-project-jobs.yml;h=1567409800ed0cb0c4e0e93f7ad412fe5aa73fdb;hb=f38fb4b3f155558f48c03e36fd1671a29766b266;hp=9df732f5d4bcefce75085f7aa3a166b78346b3a3;hpb=56b4b6eaabd5a746bf33504cf1913c9c10df2a92;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 9df732f5d..156740980 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -2,6 +2,7 @@
 # Add daily jobs, for buidoing, deploying and testing
 # TODO:
 # - [ ] Add yardstick and functest for test stage
+# - [x] Use daisy-baremetal-defauls for choosing baremetal deployment
 ######################################################################
 
 #############################
@@ -28,7 +29,7 @@
         - 'build':
             slave-label: 'opnfv-build-centos'
         - 'deploy':
-            slave-label: 'opnfv-build-centos'
+            slave-label: 'daisy-baremetal'
         - 'test':
             slave-label: 'opnfv-build-centos'
     jobs:
@@ -65,6 +66,7 @@
             project: '{project}'
             branch: '{branch}'
         - 'opnfv-build-centos-defaults'
+        - 'daisy-defaults'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'
 
@@ -155,6 +157,15 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - 'daisy-defaults'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
+        - 'daisy-defaults'
         - '{slave-label}-defaults'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'
@@ -171,21 +182,21 @@
     name: 'daisy-build-daily-macro'
     builders:
         - shell:
-            !include-raw-escape: ./daisy4nfv-basic.sh
+            !include-raw: ./daisy4nfv-basic.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-build.sh
+            !include-raw: ./daisy4nfv-build.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-upload-artifact.sh
+            !include-raw: ./daisy4nfv-upload-artifact.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-workspace-cleanup.sh
+            !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
 - builder:
     name: 'daisy-deploy-daily-macro'
     builders:
         - shell:
-            !include-raw-escape: ./daisy4nfv-download-artifact.sh
+            !include-raw: ./daisy4nfv-download-artifact.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-deploy.sh
+            !include-raw: ./daisy4nfv-deploy.sh
 
 - builder:
     name: 'daisy-test-daily-macro'