From 310224b385c6b84149fdbddfe09b02461571fc95 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 11 Aug 2021 18:14:37 -0500
Subject: [PATCH] Need to set the variables to some defaults for web triggers
modified: .gitlab-ci.yml
---
.gitlab-ci.yml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f68226e4..af39d934 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,18 @@ common:setup:
echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
+ else
+ if [[ "${JUGGLER_DETECTOR}" == "" ]] ; then
+ export JUGGLER_DETECTOR="athena"
+ fi
+ if [[ "${JUGGLER_DETECTOR_VERSION}" == "" ]] ; then
+ export JUGGLER_DETECTOR_VERSION="master"
+ fi
+ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+ echo "JUGGLER_DETECTOR_VERSION = ${JUGGLER_DETECTOR_VERSION}"
+ echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
+ echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
+ echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
fi
- source setup/bin/env.sh && ./setup/bin/install_common.sh
--
GitLab