From 59faa9977d726858902dcf513999616aaf6de7a5 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Thu, 17 Sep 2020 12:01:38 -0400 Subject: [PATCH] Need to export SET_JDK_VERSION This var is needed by the exteral script must export so that it is inherited. Signed-off-by: Aric Gardner Change-Id: I627e6ecb369a5f0dab1f047663d24ac8a07b6330 --- shell/cmake-sonar.sh | 2 +- shell/cmake-sonarqube.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/cmake-sonar.sh b/shell/cmake-sonar.sh index e568a7a3..e64ca69c 100644 --- a/shell/cmake-sonar.sh +++ b/shell/cmake-sonar.sh @@ -20,7 +20,7 @@ make_opts="${MAKE_OPTS:-}" set -ex -o pipefail -SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}" +export SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}" echo "$SET_JDK_VERSION" bash <(curl -s https://raw.githubusercontent.com/lfit/releng-global-jjb/master/shell/update-java-alternatives.sh) # shellcheck disable=SC1091 diff --git a/shell/cmake-sonarqube.sh b/shell/cmake-sonarqube.sh index 1662e330..f34f7d79 100644 --- a/shell/cmake-sonarqube.sh +++ b/shell/cmake-sonarqube.sh @@ -26,7 +26,7 @@ unzip -q bw.zip sudo mv build-wrapper-* /opt/build-wrapper -SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}" +export SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}" echo "$SET_JDK_VERSION" bash <(curl -s https://raw.githubusercontent.com/lfit/releng-global-jjb/master/shell/update-java-alternatives.sh) # shellcheck disable=SC1091 -- 2.16.6