Merge "Use lf-infra-pre-build for openstack & lftools"

diff --git a/jjb/integration/copy-common-functions.sh b/jjb/integration/copy-common-functions.sh
index e0eacdf0c1bb5dfba298f0790a1684e3f963a2ba..c8835aad2bbcf5a509b2b79962ac5f68040c48a3 100644 (file)
--- a/jjb/integration/copy-common-functions.sh
+++ b/jjb/integration/copy-common-functions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 
 # Copy the whole script to /tmp/common-functions.sh and to remote nodes but
 # only if this script itself is executing and not sourced. jenkins prepends this
@@ -11,7 +11,6 @@ if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
     echo "Copying common-functions.sh to /tmp"
     cp "${0}" /tmp/common-functions.sh
 
-    source /tmp/v/openstack/bin/activate
     mapfile -t ips <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
     for ip in "${ips[@]}"; do
         echo "Copying common-functions.sh to ${ip}:/tmp"

diff --git a/jjb/integration/integration-get-slave-addresses.sh b/jjb/integration/integration-get-slave-addresses.sh
index 9f57dfc7ae72388bb329bfc6da15c2545330008c..2546d31f68c819b3315cf640a5d1749d03116286 100644 (file)
--- a/jjb/integration/integration-get-slave-addresses.sh
+++ b/jjb/integration/integration-get-slave-addresses.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # Get the Controller and Tools VM slave addresses
 
 set -x
@@ -8,9 +8,6 @@ TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 OPENSTACK_CONTROLLERS=()
 
-OPENSTACK_VENV="/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source $OPENSTACK_VENV/bin/activate
 mapfile -t ADDR <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
 
 # The next two blocks of code will parse the list of vm IP's hostnames to determine which type of node

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e68d44d1e325df48d8ecb29b6418f8cd49988be1..1defd548879d536d64ace7f2d4d112aeb4f0a554 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -94,6 +94,7 @@
           files: 'csit/suites/{project}/**'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '1'
@@ -196,6 +197,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '1'
@@ -436,6 +438,7 @@
           files: 'csit/suites/{project}/**'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '3'
@@ -533,6 +536,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '3'
@@ -767,6 +771,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack:
           stack-template: '{stack-template}'
           vm_0_count: '3'
@@ -1008,6 +1013,7 @@
       - timed: '{schedule}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack-4-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
@@ -1231,6 +1237,7 @@
       - timed: '{schedule}'
 
     builders:
+      - lf-infra-pre-build
       - integration-infra-stack-3-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 1bf889d7078cc1b56055dc0b604838db7d460e32..493f776b7549cda38814220fa9dfcf1ab70c63b6 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -11,9 +11,6 @@
 
 echo "----------> Copy ssh public keys to csit lab"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 function copy-ssh-keys-to-slave() {
     RETRIES=60
     for j in $(seq 1 $RETRIES); do

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index a63d0ea4ba083efe34176eb072ce25d81aca008d..26e68becdf2288c4d89f867986242fe309cbdb68 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -9,15 +9,6 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-virtualenv "/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-pip install --upgrade "pip<10.0.0" setuptools
-# hardcoding cmd2 version as the most recent version seems to be broken.
-# reference: https://pypi.org/project/cmd2/#history
-pip install --upgrade cmd2==0.8.5 python-openstackclient python-heatclient
-pip freeze
-
 # TODO: Remove the if-statement once we have fully migrated to /opt/ciman
 if [ -d "/opt/ciman/openstack-hot" ]; then
     cd /opt/ciman/openstack-hot || exit 1

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7474697d7e06d3f6da44f1c9584ab50e34c97c5a..25749b388a528fbb683a64cb0eb3aa6b42723ef1 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -454,9 +454,8 @@
                 - UNSTABLE
               build-steps:
                 - shell: |
-                    #!/bin/bash
+                    #!/bin/bash -l
                     echo "Deleting $STACK_NAME"
-                    source "/tmp/v/openstack/bin/activate"
                     openstack stack delete --yes "$STACK_NAME"
           mark-unstable-if-failed: false