add instance creation process in bottlnecks jjb workflow

JIRA: BOTTLENECK-4

Change-Id: I0c1b719c9cd4d96fa2a5fb2df6773bf79f75a7be
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index e961478..249a1bd 100644 (file)
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -107,6 +107,7 @@
     builders:
         - 'bottlenecks-fetch-os-creds'
         - 'run-rubbos-env-preparation'
+        - 'bottlenecks-instance-creation'
         - 'run-rubbos-tools-installation'
         - 'rubbos-exec'
 
@@ -135,6 +136,17 @@
             cd $WORKSPACE
             ./rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
 
+- builder:
+    name: bottlenecks-instance-creation
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+
+            echo "Bottlenecks: instance creation by using heat template"
+            cd $WORKSPACE
+            ./utils/infra_setup/heat_template/HOT_create_instance.sh
+
 - builder:
     name: run-rubbos-tools-installation
     builders:
@@ -145,6 +157,8 @@
             echo "Bottlenecks: to install tools to run rubbos"
 
             cd $WORKSPACE
+            cd rubbos/rubbos_scripts/1-1-1
+            source set_bottlenecks_rubbos_env.sh
             ./rubbos/rubbos_scripts/1-1-1/scripts/run.sh
 
 - builder: