From 56cc859829f7e32f192584ff0d16800f8d92622b Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Tue, 5 Oct 2021 03:54:13 +0000
Subject: [PATCH] Do tutorial test without shoehorning in singularity
---
.gitlab-ci.yml | 15 +++++++--------
tests/tutorial/config.yml | 14 ++------------
2 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80a2d6c7a..8bd982f75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -283,7 +283,7 @@ jug_xl:nightly:
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: never
- - when: on_success
+ - when: manual
artifacts:
expire_in: 1 days
paths:
@@ -314,12 +314,6 @@ jug_xl:singularity:nightly:
needs:
- version
- jug_xl:nightly
- rules:
- - if: '$CI_COMMIT_BRANCH == "master"'
- when: on_success
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: on_success
- - when: never
variables:
BUILD_IMAGE: "jug_xl"
script:
@@ -348,16 +342,21 @@ juggler:master:
allow_failure: true
.test:
+ image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_xl:${NIGHTLY_TAG}
stage: test
needs:
- version
- - jug_xl:singularity:nightly
+ - jug_xl:nightly
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: on_success
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: on_success
- when: never
+ before_script:
+ - echo "Testing the new container setup"
+ after_script:
+ - echo "Testing completed"
include:
- local: 'tests/tutorial/config.yml'
diff --git a/tests/tutorial/config.yml b/tests/tutorial/config.yml
index c9933e23c..068ad0378 100644
--- a/tests/tutorial/config.yml
+++ b/tests/tutorial/config.yml
@@ -5,15 +5,5 @@
test:tutorial:
extends: .test
script:
- - mkdir eic && cd eic
- - mkdir -p .gitlab-ci && mv ../build/jug_xl.sif .gitlab-ci/jug_xl-ci-test.sif
- # setup our environment to be weird
- - |
- echo ROOTSYS=/invalid-path >> ~/.bashrc
- echo CC=`which gfortran` >> ~/.bashrc
- echo CXX=`which gfortran` >> ~/.bashrc
- # setup tutorial starting position
- - bash ../install.sh -v ci-test
- # now attempt the tutorial
- - ./eic-shell -- ../tests/tutorial/quick-start.sh
- - ./eic-shell -- ../tests/tutorial/part1.sh
+ - tests/tutorial/quick-start.sh
+ - tests/tutorial/part1.sh
--
GitLab