From 2bdc59b0ccb7ac12ce2a66af8316dcbf6d0793a0 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 23 Nov 2018 18:26:25 +0800 Subject: [PATCH] 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 --- jjb/opflex/opflex-macros.yaml | 1 - jjb/opflex/opflex.yaml | 1 + jjb/opflex/scripts/deploy-opflex.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/opflex/opflex-macros.yaml b/jjb/opflex/opflex-macros.yaml index c1dfa113d..278c2496e 100644 --- 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 5d793db6e..ff6acfc8a 100644 --- 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 2fa61bd60..3ee1e2f41 100644 --- 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. -- 2.36.6