Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/mirror.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
description: 'common_bench branch/tag to use'
required: false
default: ''
BENCHMARK_RUNNER:
description: 'Runner backend to use (htcondor or empty for local)'
required: false
default: 'htcondor'
SOURCE_REPOSITORY:
description: 'Repository to report status to (owner/repo)'
required: false
Expand Down Expand Up @@ -65,6 +69,7 @@ jobs:
GITHUB_PR=${{ inputs.SOURCE_PR || github.event.pull_request.number }}
PIPELINE_NAME=${{ inputs.SOURCE_REPOSITORY || github.repository }}: ${{ inputs.SOURCE_TITLE || github.event.pull_request.title || github.ref_name }}
COMMON_BENCH_VERSION=${{ inputs.COMMON_BENCH_VERSION }}
BENCHMARK_RUNNER=${{ inputs.BENCHMARK_RUNNER || 'htcondor' }}
- name: Set pending EICweb status
if: ${{ github.event_name != 'delete' && !inputs.SOURCE_SHA }}
env:
Expand Down
12 changes: 12 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ default:
reports:
dotenv: .env
when: always
id_tokens:
CI_JOB_JWT:
aud: https://eicweb.phy.anl.gov

stages:
- status-pending
Expand Down Expand Up @@ -116,13 +119,22 @@ common:setup:
- mkdir "${DETECTOR_CONFIG}"
- ln -s "${LOCAL_DATA_PATH}/sim_output" "${DETECTOR_CONFIG}/sim_output"
- ln -s "../results" "${DETECTOR_CONFIG}/results"
- if [ ! -w "$SNAKEMAKE_OUTPUT_CACHE" ] ; then
export SNAKEMAKE_OUTPUT_CACHE=${LOCAL_DATA_PATH}/snakemake-cache ;
fi
- mkdir -p "$SNAKEMAKE_OUTPUT_CACHE"
- ls -lrtha
retry:
max: 2
when:
- runner_system_failure

.det_benchmark:htcondor:
extends: .det_benchmark
tags:
- osg
- jacamar

include:
- local: 'benchmarks/backgrounds/config.yml'
- local: 'benchmarks/backwards_ecal/config.yml'
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/campaign/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
bench:campaign:
extends: .det_benchmark
extends: .det_benchmark:htcondor
stage: benchmarks
script:
- snakemake $SNAKEMAKE_FLAGS --cores 1 campaign_benchmark

collect_results:campaign:
extends: .det_benchmark
extends: .det_benchmark:htcondor
stage: collect
needs:
- "bench:campaign"
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/material_scan/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
bench:material_scan:
extends: .det_benchmark
extends: .det_benchmark:htcondor
stage: benchmarks
script:
- snakemake $SNAKEMAKE_FLAGS --cores 1 results/material_scan/epic_craterlake/material_scan_details.pdf

collect_results:material_scan:
extends: .det_benchmark
extends: .det_benchmark:htcondor
stage: collect
needs:
- ["bench:material_scan"]
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/rich/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bench:drich_fixed_eta:
extends: .det_benchmark
extends: .det_benchmark:htcondor
stage: benchmarks
script:
- cmake -S benchmarks/rich -B build -DCMAKE_INSTALL_PREFIX=.local
Expand All @@ -11,7 +11,7 @@ bench:drich_fixed_eta:
done

collect_results:rich:
extends: .det_benchmark
extends: .det_benchmark:htcondor
stage: collect
needs:
- "bench:drich_fixed_eta"
Expand Down