From c83c527ce47b107ce913c5ab3888c0678d48beee Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 26 Feb 2019 14:52:07 +0100
Subject: [PATCH] cloud-infra: Pre-provisioned slaves and wait before using
 slave

Jenkins OpenStack instances doesn't really help in our case since the
job needs a slave where it can trigger creation of a slave from
OpenStack which will break the downstream triggering of job on same
slave. We instead fallback to pre-provisioned slaves.

Another issue is that when the instance first gets attached to Jenkins
as slave, it takes some time before it becomes fully functional so
we need to wait.

Change-Id: Ic77b81d2bbdd107cd1a506fc1e9f7ec6be6b3c1e
---
 jjb/cloud-infra/cloud-infra-verify-jobs.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
index 901ceb6b0..100371047 100644
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -56,6 +56,9 @@
           project: '{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
+      - label:
+          name: SLAVE_LABEL
+          default: 'cloud-infra-vpod'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -82,10 +85,6 @@
           timeout: 120
       - fix-workspace-permissions
       - openstack:
-          instances:
-            - cloud-name: Xerces_EST_ONAP
-              template-name: cloud-infra-vpod
-              count: 1
           single-use: True
 
     scm:
@@ -178,6 +177,12 @@
 - builder:
     name: 'cloud-infra-verify-deploy-macro'
     builders:
+      - shell: |
+          #!/bin/bash
+
+          # it takes some time before the OpenStack slave becomes fully operational
+          # so we give it some more time before doing anything
+          sleep 30
       - shell:
           !include-raw: ./cloud-infra-deploy.sh
 
-- 
2.25.1