Use lf-infra-pre-build for lftools install

lftools-install.sh is deprecated and should no longer be used.

Change-Id: Idd882fc78692bcbec336e857fac3001db3df35d2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/opflex/opflex-macros.yaml b/jjb/opflex/opflex-macros.yaml
index c1dfa113d40fb31a5b4f1b7e2443cdbf0113ca5c..278c2496e066dd5c7df382e8896e7c95fe8a47c1 100644 (file)
--- a/jjb/opflex/opflex-macros.yaml
+++ b/jjb/opflex/opflex-macros.yaml
@@ -48,7 +48,6 @@
               GROUP_ID={group-id}
               UPLOAD_FILES_PATH={upload-files-dir}
       - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
           - ../global-jjb/shell/common-variables.sh
           - scripts/deploy-opflex.sh
 

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 5d793db6e0df06c8a6ffe47457899b3f48575179..ff6acfc8af15a8ca4e3fc53d05b6f16305370f64 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -100,6 +100,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - opflex-build:
           mvn33: '{mvn-version}'
           stream: '{stream}'

diff --git a/jjb/opflex/scripts/deploy-opflex.sh b/jjb/opflex/scripts/deploy-opflex.sh
index 2fa61bd60e63dd22c5c6f550b8ea8548e89dc23b..3ee1e2f41cf6467e43a17c118dc2956eadcecc10 100644 (file)
--- a/jjb/opflex/scripts/deploy-opflex.sh
+++ b/jjb/opflex/scripts/deploy-opflex.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.