X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fnolabs%2Fnolabs-booking-jobs.yaml;h=f36796967f09fc400867b35b6ae0d28e1fa0d39a;hb=8785eaaf4ff9b2e9c289a3f46f0336c717e83ef7;hp=7f46a52fec0ceabca565a8967749a28c38fbd36d;hpb=41a9dddf60d110b1001470d5d05b2a23b91a78e9;p=infra%2Fcicd.git

diff --git a/jjb/nolabs/nolabs-booking-jobs.yaml b/jjb/nolabs/nolabs-booking-jobs.yaml
index 7f46a52f..f3679696 100644
--- 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'
@@ -59,9 +60,11 @@
 
     target-site:
       - 'test':
+          api-tokens-endpoint: 'http://188.212.108.245/api/tokens'
           api-users-endpoint: 'http://188.212.108.245/api/users'
           api-bookings-endpoint: 'http://188.212.108.245/api/bookings'
       - 'production':
+          api-tokens-endpoint: 'https://labs.nordix.org/api/tokens'
           api-users-endpoint: 'https://labs.nordix.org/api/users'
           api-bookings-endpoint: 'https://labs.nordix.org/api/bookings'
 
@@ -71,7 +74,7 @@
 - job-template:
     name: 'nolabs-{booking-phase}-booking-{target-site}site-{stream}'
 
-    disabled: '{obj:disabled}'
+    node: '{slave-label}'
 
     concurrent: true
 
@@ -84,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}'
@@ -100,6 +103,10 @@
           name: DEPLOY_SCENARIO
           default: 'k8-mycoolplugin-mycoolfeature'
           description: 'Scenario to deploy for the booking. Default is a non-existent scenario to prevent running the job by mistake.'
+      - string:
+          name: NOLABS_API_TOKENS_ENDPOINT
+          default: '{api-tokens-endpoint}'
+          description: 'API endpoint for tokens.'
       - string:
           name: NOLABS_API_USERS_ENDPOINT
           default: '{api-users-endpoint}'
@@ -118,35 +125,36 @@
           description: 'Python virtualenv location to use.'
       - string:
           name: GERRIT_REFSPEC
-          default: 'refs/changes/79/2079/8'
+          default: 'refs/changes/74/3574/3'
           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:
           - file:
-              credential-id: openrc-city-nolabs-default-nordix.sh
+              credential-id: nordix-nolabs-openrcfile-city-karlskrona-defaultproject
               variable: OPENRC_FILE
           - username-password-separated:
+              credential-id: nordix-nolabs-jenkins-api-credentials
               username: NOLABS_API_USERNAME
               password: NOLABS_API_PASSWORD
       - mask-passwords
@@ -165,6 +173,8 @@
           clean_before: false
 
     builders:
+      - description-setter:
+          description: $BOOKING_ID | $DEPLOY_SCENARIO
       - '{booking-phase}booking-macro'
 
 # vim: set ts=2 sw=2 expandtab: