From cc76ecc0e7945aa5f9fc092e728575afd784862e Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 7 Oct 2023 07:05:35 +0000
Subject: [PATCH] Cleanup env file
---
.gitlab-ci.yml | 19 ++++++-------------
bin/env.sh | 14 +++++++-------
2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dc7085..ec593f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: ${BENCHMARKS_REGISTRY}/${BENCHMARKS_CONTAINER}:${BENCHMARKS_TAG}
variables:
DETECTOR: "epic"
DETECTOR_VERSION: "main"
+ DETECTOR_CONFIG: 'epic_brycecanyon'
workflow:
rules:
@@ -45,13 +46,11 @@ common:variables:
script:
- |
echo " CI_PIPELINE_SOURCE = ${CI_PIPELINE_SOURCE}"
- echo " COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}"
if [[ "${CI_PIPELINE_SOURCE}" == "push" || "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then
export COMMON_BENCH_VERSION=${CI_COMMIT_REF_NAME}
echo "COMMON_BENCH_VERSION=${CI_COMMIT_REF_NAME}" >> .env
- echo "DETECTOR=${DETECTOR}" >> .env
- echo "DETECTOR_VERSION=${DETECTOR_VERSION}" >> .env
- echo "COMMON_BENCH_VERSION=${CI_COMMIT_REF_NAME}"
+ #echo "DETECTOR=${DETECTOR}" >> .env
+ #echo "DETECTOR_VERSION=${DETECTOR_VERSION}" >> .env
fi
echo "COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}"
@@ -80,21 +79,16 @@ detector_benchmarks:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs: ["common:variables"]
- variables:
- COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION"
trigger:
project: EIC/benchmarks/detector_benchmarks
strategy: depend
parallel:
matrix:
- DETECTOR: 'epic'
- DETECTOR_CONFIG: 'epic_arches'
- DETECTOR_VERSION: 'main'
- DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
- - DETECTOR: 'epic'
- DETECTOR_CONFIG: 'epic_brycecanyon'
+ DETECTOR_CONFIG: ['epic_arches','epic_brycecanyon']
DETECTOR_VERSION: 'main'
DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
+ COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION"
other_detector_benchmarks:
@@ -102,8 +96,6 @@ other_detector_benchmarks:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs: ["common:variables"]
- variables:
- COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION"
trigger:
project: EIC/benchmarks/detector_benchmarks
parallel:
@@ -111,4 +103,5 @@ other_detector_benchmarks:
- DETECTOR: 'DII'
DETECTOR_VERSION: 'main'
BEAMLINE: 'ip8'
+ COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION"
diff --git a/bin/env.sh b/bin/env.sh
index 9db3a4d..d25eb06 100755
--- a/bin/env.sh
+++ b/bin/env.sh
@@ -134,18 +134,18 @@ export ROOT_BUILD_DIR=$LOCAL_PREFIX/root_build
export ROOT_INCLUDE_PATH=${LOCAL_PREFIX}/include:${ROOT_INCLUDE_PATH}
echo "DETECTOR=${DETECTOR}" >> .env
-echo "DETECTOR_CONFIG=${DETECTOR_CONFIG}" >> .env
+#echo "DETECTOR_CONFIG=${DETECTOR_CONFIG}" >> .env
echo "DETECTOR_VERSION=${DETECTOR_VERSION}" >> .env
echo "DETECTOR_REPOSITORYURL=${DETECTOR_REPOSITORYURL}" >> .env
echo "BEAMLINE=${BEAMLINE}" >> .env
echo "BEAMLINE_VERSION=${BEAMLINE_VERSION}" >> .env
echo "BEAMLINE_REPOSITORYURL=${BEAMLINE_REPOSITORYURL}" >> .env
-echo "BENCHMARK_N_EVENTS=${BENCHMARK_N_EVENTS}" >> .env
-echo "BENCHMARK_N_THREADS=${BENCHMARK_N_THREADS}" >> .env
-echo "BENCHMARK_RNG_SEED=${BENCHMARK_RNG_SEED}" >> .env
-echo "JUGGLER_N_EVENTS=${JUGGLER_N_EVENTS}" >> .env
-echo "JUGGLER_N_THREADS=${JUGGLER_N_THREADS}" >> .env
-echo "JUGGLER_RNG_SEED=${JUGGLER_RNG_SEED}" >> .env
+#echo "BENCHMARK_N_EVENTS=${BENCHMARK_N_EVENTS}" >> .env
+#echo "BENCHMARK_N_THREADS=${BENCHMARK_N_THREADS}" >> .env
+#echo "BENCHMARK_RNG_SEED=${BENCHMARK_RNG_SEED}" >> .env
+#echo "JUGGLER_N_EVENTS=${JUGGLER_N_EVENTS}" >> .env
+#echo "JUGGLER_N_THREADS=${JUGGLER_N_THREADS}" >> .env
+#echo "JUGGLER_RNG_SEED=${JUGGLER_RNG_SEED}" >> .env
echo "LOCAL_PREFIX=${LOCAL_PREFIX}" >> .env
echo "DETECTOR_PREFIX=${DETECTOR_PREFIX}" >> .env
echo "DETECTOR_PATH=${DETECTOR_PATH}" >> .env
--
GitLab