diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23798cd168efe596664cfc3f0706c398ea0d0d2c..e461b72c6579fcb7d2b8dc62c83486e108973ab2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ default: + tags: + - singularity before_script: - ls -lrth && pwd artifacts: @@ -19,39 +21,42 @@ stages: - benchmarks - deploy -env: - tags: - - singularity - stage: config - script: - - bash bin/config_env.sh +include: '.local/share/common.yml' -detector: - tags: - - singularity - stage: initialize - needs: ["env"] - timeout: 1 hours - #cache: - # key: - # files: - # - options/env.sh - # - util/build_detector.sh - # prefix: "$CI_COMMIT_REF_SLUG" - # paths: - # - .local/detector - # - .local/lib - script: - - whoami && hostname - - ls -lrth - - pwd - - ./bin/print_env.sh - - ./bin/build_detector.sh - - ./bin/print_env.sh - - mkdir -p results - - mkdir -p config - - echo "$CI_PIPLINE_ID" && echo "$CI_PROJECT_NAME" + #env: + # tags: + # - singularity + # stage: config + # script: + # - bash bin/config_env.sh + # + # + #detector: + # tags: + # - singularity + # stage: initialize + # needs: ["env"] + # timeout: 1 hours + # #cache: + # # key: + # # files: + # # - options/env.sh + # # - util/build_detector.sh + # # prefix: "$CI_COMMIT_REF_SLUG" + # # paths: + # # - .local/detector + # # - .local/lib + # script: + # - whoami && hostname + # - ls -lrth + # - pwd + # - ./bin/print_env.sh + # - ./bin/build_detector.sh + # - ./bin/print_env.sh + # - mkdir -p results + # - mkdir -p config + # - echo "$CI_PIPLINE_ID" && echo "$CI_PROJECT_NAME" #get_data: # stage: data_init diff --git a/share/common.yml b/share/common.yml index 9ed10d79aba96d21fe706be592282f6b3a4f0c09..8bab08b72d0a7ccb7aa0a1f26a315de0ddc754d9 100644 --- a/share/common.yml +++ b/share/common.yml @@ -1,14 +1,11 @@ common:setup: stage: config - artifacts: - expire_in: 72 hours - paths: - - .local/detector - - .local/lib - - .local/bin - - .local/include - - results - - config script: - git clone "${CI_REPOSITORY_URL}" setup - - source setup/bin/env.sh && ./setup./ + - source setup/bin/env.sh && ./setup/bin/build_common.sh + +common:detector: + stage: initialize + needs: ["common:setup"] + script: + - source .local/bin/env.sh && build_detector.sh