diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce93e05f17033589d7455e739b31648a43fa0afe..09a5c2a1d7f0747c5975633a35c368a11228bb85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,11 @@ image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest workflow: rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_PIPELINE_SOURCE == "web"' - - if: '$CI_PIPELINE_SOURCE == "webide"' - - if: '$CI_COMMIT_BRANCH == "master"' - - if: '$CI_COMMIT_TAG' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_SERVER_HOST == "eicweb.phy.anl.gov")' + - if: '$CI_PIPELINE_SOURCE == "web" && ($CI_SERVER_HOST == "eicweb.phy.anl.gov")' + - if: '$CI_PIPELINE_SOURCE == "webide" && ($CI_SERVER_HOST == "eicweb.phy.anl.gov")' + - if: '$CI_COMMIT_BRANCH == "master" && ($CI_SERVER_HOST == "eicweb.phy.anl.gov")' + - if: '$CI_COMMIT_TAG && ($CI_SERVER_HOST == "eicweb.phy.anl.gov")' default: before_script: @@ -73,15 +73,15 @@ detector_benchmarks: project: EIC/benchmarks/detector_benchmarks strategy: depend - #physics_benchmarks: - # stage: benchmarks - # needs: ["common:variables"] - # variables: - # JUGGLER_DETECTOR: "athena" - # COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION" - # trigger: - # project: EIC/benchmarks/physics_benchmarks - # strategy: depend +physics_benchmarks: + stage: benchmarks + needs: ["common:variables"] + variables: + JUGGLER_DETECTOR: "athena" + COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION" + trigger: + project: EIC/benchmarks/physics_benchmarks + strategy: depend pages: