From ce3f5bc1005df5198b68d12184c5d8c84a4333f5 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Thu, 15 Aug 2019 16:38:56 -0500
Subject: [PATCH] modified: .gitlab-ci.yml modified:
containers/singularity/Singularity modified: tests/elastic_test.sh
---
.gitlab-ci.yml | 19 ++++++++++---------
containers/singularity/Singularity | 12 ++++++------
tests/elastic_test.sh | 3 +++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 366f48d..02e7935 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 ffb9154..649e7e8 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 5e4b825..48e7907 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
--
GitLab