Skip to content

Commit 0bf920f

Browse files
Terrence Mitchemjswaro
authored andcommitted
contrib/cray: HPE internal Debian build updates
Signed-off-by: Terrence Mitchem <[email protected]>
1 parent 3650d18 commit 0bf920f

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

contrib/cray/build.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,22 @@
66
set -Exeuo pipefail
77

88
CE_BUILD_SCRIPT_REPO=hpc-shs-ce-devops
9-
CE_CONFIG_BRANCH=${CE_CONFIG_BRANCH:-main}
10-
if [ -d ${CE_BUILD_SCRIPT_REPO} ]; then
9+
10+
# Use appropriate ce-devops branch
11+
if [[ -n "${BRANCH_NAME:-}" && "$BRANCH_NAME" =~ "release/shs-" ]]; then
12+
CE_CONFIG_BRANCH=$BRANCH_NAME
13+
elif [[ -n "${CHANGE_TARGET:-}" && "$CHANGE_TARGET" =~ "release/shs-" ]]; then
14+
CE_CONFIG_BRANCH=$CHANGE_TARGET
15+
else
16+
CE_CONFIG_BRANCH=${CE_CONFIG_BRANCH:-main}
17+
fi
18+
19+
if [ -d "${CE_BUILD_SCRIPT_REPO}" ]; then
20+
git -C ${CE_BUILD_SCRIPT_REPO} fetch
1121
git -C ${CE_BUILD_SCRIPT_REPO} checkout ${CE_CONFIG_BRANCH}
1222
git -C ${CE_BUILD_SCRIPT_REPO} pull
1323
else
1424
git clone --branch "${CE_CONFIG_BRANCH}" https://$HPE_GITHUB_TOKEN@github.hpe.com/hpe/${CE_BUILD_SCRIPT_REPO}.git
1525
fi
1626

17-
. ${CE_BUILD_SCRIPT_REPO}/build/sh/rpmbuild/load.sh
18-
19-
setup_dst_env
20-
dst_build_rpm -c ${CE_BUILD_SCRIPT_REPO}/build/configs/${CE_CONFIG_FILE} $@
21-
27+
. "${CE_BUILD_SCRIPT_REPO}/build/libfabric/build.sh"

0 commit comments

Comments
 (0)