back to phy-scratch

.gitlab-ci.yml

@@ -6,7 +6,7 @@ variables:
 
 default:
   tags:
-    - phy
+    - phy-scratch
   artifacts:
     expire_in: 72 hours 
     paths:
@@ -23,11 +23,7 @@ common:setup:
   stage: config
   before_script:
     - |
-      if [[ "${COMMON_BENCH_VERSION}" == "" ]] ; then
-        export COMMON_BENCH_VERSION="master" 
-      fi
-      echo "COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}" 
-      git clone -b "${COMMON_BENCH_VERSION}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
+      git clone -b "${COMMON_BENCH_VERSION:-master}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
   script:
     - |
       if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "main" ]]; then
@@ -67,26 +63,16 @@ common:setup:
       fi
     - source setup/bin/env.sh && ./setup/bin/install_common.sh
 
-common:detector:
-  stage: initialize
-  needs: ["common:setup"]
-  script:
-    - source .local/bin/env.sh && build_detector.sh
-    - mkdir_local_data_link sim_output
-    - mkdir -p results
-    - mkdir -p config
-    - print_env.sh
-
 common:benchmarks:
   stage: initialize
   needs: ["common:setup"]
   script:
-    - git clone ${GITHUB_REPOSITORY} /scratch/${CI_PROJECT_NAME}_${CI_PIPELINE_ID}/benchmarks
-    - git -C /scratch/${CI_PROJECT_NAME}_${CI_PIPELINE_ID}/benchmarks checkout ${GITHUB_REF}
+    - git clone ${GITHUB_REPOSITORY} benchmarks
+    - git -C benchmarks checkout ${GITHUB_REF}
 
 benchmarks:running:
   stage: running
   needs: ["common:benchmarks"]
   trigger:
     include:
-      - local: '/scratch/${CI_PROJECT_NAME}_${CI_PIPELINE_ID}/benchmarks/config.yml'
+      - local: 'benchmarks/config.yml'