Update block parameters

[releng.git] / jjb / daisy4nfv / daisy-project-jobs.yml

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 9df732f..e631ee9 100644 (file)
--- 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
 ######################################################################
 
 #############################
@@ -22,13 +23,13 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     phase:
         - 'build':
             slave-label: 'opnfv-build-centos'
         - 'deploy':
-            slave-label: 'opnfv-build-centos'
+            slave-label: 'daisy-baremetal'
         - 'test':
             slave-label: 'opnfv-build-centos'
     jobs:
@@ -53,6 +54,11 @@
             enabled: true
             max-total: 4
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{installer}-daily-.*'
+            block-level: 'NODE'
 
     scm:
         - git-scm
@@ -65,6 +71,7 @@
             project: '{project}'
             branch: '{branch}'
         - 'opnfv-build-centos-defaults'
+        - 'daisy-defaults'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'
 
@@ -136,11 +143,6 @@
             enabled: true
             max-total: 6
             option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - '{installer}-.*deploy-.*'
-            block-level: 'NODE'
 
     scm:
         - git-scm
@@ -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: ./daisy-deploy.sh
 
 - builder:
     name: 'daisy-test-daily-macro'