From 5b3ccf642b08737dd46a2449486aebee19d09701 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Thu, 15 Aug 2019 16:47:26 -0500
Subject: [PATCH] modified: .gitlab-ci.yml modified:
tests/elastic_test.sh
---
.gitlab-ci.yml | 10 ++++++----
tests/elastic_test.sh | 5 +++++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e8e1e6..7cf5124 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,20 +20,22 @@ hcana_singularity:
#when: manual
dependencies:
- hcana_docker
-#- /bin/bash .gitlabci/setup.sh
script:
+ - /bin/bash .gitlabci/setup.sh
- mkdir -p build
- pwd
- cp containers/singularity/Singularity Singularity.hcana
- cp Singularity.hcana build/.
-#- /bin/bash .gitlabci/build.sh Singularity.hcana
-#- cp Singularity.hcana.simg build/.
+ - /bin/bash .gitlabci/build.sh Singularity.hcana
+ - cp Singularity.hcana.simg build/.
artifacts:
paths:
- build/Singularity.hcana
-#- build/Singularity.hcana.simg
+ - build/Singularity.hcana.simg
elastic_tests:
+ tags:
+ - eic0 docker
stage: data_tests
dependencies:
- hcana_singularity
diff --git a/tests/elastic_test.sh b/tests/elastic_test.sh
index 48e7907..8a903c3 100644
--- a/tests/elastic_test.sh
+++ b/tests/elastic_test.sh
@@ -7,3 +7,8 @@ which hcana
ls -lrth
ls -lrth build
+
+singularity help build/Singularity.hcana.simg
+
+singularity exec build/Singularity.hcana.simg which hcana
+
--
GitLab