cloud-infra: Use dotted version for k8-calico-spinnaker

[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 a40d909931ba5bc3994802d36bd78f1d29db40af..313c53b6b251b30168d3c075d9eccc99c6b5bf69 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}'
@@ -133,19 +134,19 @@
 
     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: 10
-          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: