From b8815cb51f9d95165c297c640c7ad239c031930e Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 19 May 2022 23:26:35 +0800
Subject: [PATCH] build_inf_prepare_jenkins: fix the export veriables

Issue-ID: INF-274

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I9bd6fc1eba7770dc10ea75c4316b7fe454d7d835
---
 scripts/build_inf.sh                                  |  4 ++--
 scripts/build_inf_centos/build_inf_prepare_jenkins.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/build_inf.sh b/scripts/build_inf.sh
index cf8167a..b5f4846 100755
--- a/scripts/build_inf.sh
+++ b/scripts/build_inf.sh
@@ -162,9 +162,9 @@ fi
 # dry-run is not supported yet for CentOS build
 if [ -z "${DRYRUN}" ]; then
     if [ "$CI" = "true" ]; then
-        ${SCRIPT_CENTOS_PRE} -w ${WORKSPACE_CENTOS}
+        ${SCRIPT_CENTOS_PRE} -w ${WORKSPACE_CENTOS} || true
     fi
-    ${SCRIPT_CENTOS} -w ${WORKSPACE_CENTOS} ${DRYRUN}
+    ${SCRIPT_CENTOS} -w ${WORKSPACE_CENTOS} ${DRYRUN} || true
 fi
 
 ${SCRIPT_YP} -w ${WORKSPACE_YP} ${DRYRUN} ${YP_ARGS}
diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
index 751073d..f7a14b0 100755
--- a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
+++ b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
@@ -24,11 +24,6 @@ set -e -o pipefail
 WORKSPACE=""
 MIRROR_CONTAINER_IMG=infbuilder/inf-centos-mirror:2022.05-stx.6.0
 
-export BUILD_GROUP="jenkins"
-export WGET_OPENDEV="wget --no-check-certificate"
-export LOCALDISK="${WORKSPACE}/localdisk"
-export MIRROR_DIR="${WORKSPACE}/mirror"
-
 #########################################################################
 # Common Functions
 #########################################################################
@@ -90,6 +85,11 @@ get_mirror () {
 #########################################################################
 # Main process
 #########################################################################
+set -x
+export BUILD_GROUP="jenkins"
+export WGET_OPENDEV="wget --no-check-certificate"
+export LOCALDISK="${WORKSPACE}/localdisk"
+export MIRROR_DIR="${WORKSPACE}/mirror"
 
 sudo mkdir -p ${LOCALDISK}/loadbuild/mock-cache
 sudo mkdir -p ${LOCALDISK}/loadbuild/mock
-- 
2.16.6