Switch to new location for heat environment files

[infra/cicd.git] / jjb / nolabs / nolabs-booking-jobs.yaml

diff --git a/jjb/nolabs/nolabs-booking-jobs.yaml b/jjb/nolabs/nolabs-booking-jobs.yaml
index 10ec302ad49e15765b5a53b8f1b0ca76305e5fc1..accdf39b4d8891e905444553ebded8d283190862 100644 (file)
--- a/jjb/nolabs/nolabs-booking-jobs.yaml
+++ b/jjb/nolabs/nolabs-booking-jobs.yaml
@@ -50,8 +50,9 @@
     stream:
       - 'master':
           branch: '{stream}'
-          slave-label: 'vpod-deploy-ubuntu1804'
+          slave-label: 'nolabs-booking-slave'
           build-timeout: 60
+#          slave-label: 'vpod-deploy-ubuntu1804'
 
     booking-phase:
       - 'handle'
@@ -73,7 +74,7 @@
 - job-template:
     name: 'nolabs-{booking-phase}-booking-{target-site}site-{stream}'
 
-    disabled: '{obj:disabled}'
+    node: '{slave-label}'
 
     concurrent: true
 
@@ -86,10 +87,10 @@
           name: TARGET_SITE
           default: '{target-site}'
           description: 'Target site to handle the bookings for.'
-      - label:
-          name: SLAVE_LABEL
-          default: '{slave-label}'
-          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use.'
+#      - label:
+#          name: SLAVE_LABEL
+#          default: '{slave-label}'
+#          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use.'
       - string:
           name: BOOKING_PHASE
           default: '{booking-phase}'
@@ -124,28 +125,28 @@
           description: 'Python virtualenv location to use.'
       - string:
           name: GERRIT_REFSPEC
-          default: 'refs/changes/79/2079/8'
+          default: 'refs/changes/79/2079/10'
           description: 'Refspec to checkout'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: 'https://gerrit.nordix.org/gitweb?p=infra/engine.git;a=blob_plain;f=engine/provisioner/heat/playbooks/roles/install-configure-heat/files/heat-environment.yaml;h=401e1c4f547e9a2631e68d800cbcadef81b85641;hb=70df134c93b7ca3232ae723c3de98ad2b0299728'
+          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/bootstrap-hwconfig/files/heat-environment.yaml"
           description: 'Using a special heat environment file until the change gets merged.'
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'cloud-infra-verify-engine-.*'
-            - 'cloud-infra-verify-scenario-.*'
-            - 'cloud-infra-periodic-engine-.*'
-            - 'k8-.*'
-            - 'nolabs-.*'
-          block-level: 'NODE'
-      - throttle:
-          max-per-node: 1
-          max-total: 3
-          option: project
+#      - build-blocker:
+#          use-build-blocker: true
+#          blocking-jobs:
+#            - 'cloud-infra-verify-engine-.*'
+#            - 'cloud-infra-verify-scenario-.*'
+#            - 'cloud-infra-periodic-engine-.*'
+#            - 'k8-.*'
+#            - 'nolabs-.*'
+#          block-level: 'NODE'
+#      - throttle:
+#          max-per-node: 1
+#          max-total: 10
+#          option: project
 
     wrappers:
       - credentials-binding: