From 346bfa8a910763ed0260da217933853a7bcec948 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 1 Oct 2019 20:13:47 +0200
Subject: [PATCH] nolabs: Move jobs to nolabs tenant

Change-Id: I8526d23b4e720355db493de78c51cd561a38fbd6
---
 jjb/nolabs/booking-job-macros.yaml  |  6 ++--
 jjb/nolabs/delete-booking.sh        |  1 +
 jjb/nolabs/handle-booking.sh        |  1 +
 jjb/nolabs/nolabs-booking-jobs.yaml | 43 +++++++++++++++--------------
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/jjb/nolabs/booking-job-macros.yaml b/jjb/nolabs/booking-job-macros.yaml
index 4fc20d345..3c4d6ebfd 100644
--- a/jjb/nolabs/booking-job-macros.yaml
+++ b/jjb/nolabs/booking-job-macros.yaml
@@ -25,7 +25,8 @@
           !include-raw: ../cloud-infra/wait-for-pkg-manager.sh
       - shell: |
           #!/bin/bash
-          cp $OPENRC_FILE /tmp/openrc
+          /bin/rm -f /tmp/openrc
+          /bin/cp -f $OPENRC_FILE /tmp/openrc
       - shell:
           !include-raw: ./handle-booking.sh
 
@@ -36,6 +37,7 @@
           !include-raw: ../cloud-infra/wait-for-pkg-manager.sh
       - shell: |
           #!/bin/bash
-          cp $OPENRC_FILE /tmp/openrc
+          /bin/rm -f /tmp/openrc
+          /bin/cp -f $OPENRC_FILE /tmp/openrc
       - shell:
           !include-raw: ./delete-booking.sh
diff --git a/jjb/nolabs/delete-booking.sh b/jjb/nolabs/delete-booking.sh
index 9b53764e8..a4b938de6 100644
--- a/jjb/nolabs/delete-booking.sh
+++ b/jjb/nolabs/delete-booking.sh
@@ -3,6 +3,7 @@
 cd $WORKSPACE
 
 # install dependencies
+sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" > /dev/null
 sudo apt install -y virtualenv jq > /dev/null
 /bin/rm -rf $NOLABS_VENV && mkdir -p $NOLABS_VENV
 virtualenv -p python3 $NOLABS_VENV > /dev/null
diff --git a/jjb/nolabs/handle-booking.sh b/jjb/nolabs/handle-booking.sh
index 4b011027d..e0096a959 100644
--- a/jjb/nolabs/handle-booking.sh
+++ b/jjb/nolabs/handle-booking.sh
@@ -3,6 +3,7 @@
 cd $WORKSPACE
 
 # install dependencies
+sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse" > /dev/null
 sudo apt install -y virtualenv jq > /dev/null
 /bin/rm -rf $NOLABS_VENV && mkdir -p $NOLABS_VENV
 virtualenv -p python3 $NOLABS_VENV > /dev/null
diff --git a/jjb/nolabs/nolabs-booking-jobs.yaml b/jjb/nolabs/nolabs-booking-jobs.yaml
index a40d90993..ca3d952da 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'
@@ -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:
@@ -160,8 +161,8 @@
       - build-timeout:
           timeout: '{build-timeout}'
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
+#      - openstack:
+#          single-use: True
 
     scm:
       - git-scm:
-- 
2.25.1