diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 366f48dbc1e040cce275266c2b1fdacb122a7465..02e79354d8be0cf0d02013d2df1fdcceb646f0dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: eicweb.phy.anl.gov:4567/whit/image_recipes/root_base:latest stages: - build - build_sing_img - - data_tests +# - data_tests hcana_docker: stage: build @@ -17,23 +17,24 @@ hcana_singularity: tags: - singularity stage: build_sing_img - when: manual + #when: manual dependencies: - hcana_docker script: - - /bin/bash .gitlabci/setup.sh - - mkdir -p build - - pwd + #- /bin/bash .gitlabci/setup.sh + #- mkdir -p build + #- pwd - cp containers/singularity/Singularity Singularity.hcana - - /bin/bash .gitlabci/build.sh Singularity.hcana - - cp Singularity.hcana.simg build/. + #- /bin/bash .gitlabci/build.sh Singularity.hcana + #- cp Singularity.hcana.simg build/. - cp Singularity.hcana build/. artifacts: paths: - - build/Singularity.hcana.simg + #- build/Singularity.hcana.simg - build/Singularity.hcana elastic_tests: - stage: data_tests + #stage: data_tests + dependency: hcana_singularity script: - bash tests/elastic_test.sh diff --git a/containers/singularity/Singularity b/containers/singularity/Singularity index ffb9154d850b994d73a8fb2e5ebafdbc580ada7c..649e7e8f3d527d331aa6d419e02dee835e0f28d3 100644 --- a/containers/singularity/Singularity +++ b/containers/singularity/Singularity @@ -1,5 +1,5 @@ Bootstrap: docker -From: hallac/hcana:latest +From: eicweb.phy.anl.gov:4567/jlab/hallc/analyzer_software/hcana:latest %help Hall A/C container. @@ -29,11 +29,11 @@ From: hallac/hcana:latest source /usr/local/bin/thisroot.sh ## libformat and nlohmann json used heavily in new generation replay scripts ## libformat - cd /tmp && git clone https://github.com/fmtlib/fmt.git && cd fmt && \ - git checkout 5.3.0 && mkdir /tmp/build && cd /tmp/build && \ - cmake -DBUILD_SHARED_LIBS=TRUE ../fmt && - make -j4 install && cd /tmp && rm -r /tmp/build && rm -r /tmp/fmt - ## json + #cd /tmp && git clone https://github.com/fmtlib/fmt.git && cd fmt && \ + # git checkout 5.3.0 && mkdir /tmp/build && cd /tmp/build && \ + # cmake -DBUILD_SHARED_LIBS=TRUE ../fmt && + # make -j4 install && cd /tmp && rm -r /tmp/build && rm -r /tmp/fmt + ### json apt-get install nlohmann-json-dev # ======================= diff --git a/tests/elastic_test.sh b/tests/elastic_test.sh index 5e4b8256b7cc40ea62a82a6e522cf918792fcb61..48e790765b4b04fc644d39a42d8c898e8e1e5d7e 100644 --- a/tests/elastic_test.sh +++ b/tests/elastic_test.sh @@ -4,3 +4,6 @@ echo "This is the elastic testing..." echo " " echo "There are currently 0 tests to run!" which hcana + +ls -lrth +ls -lrth build