Skip to content
Snippets Groups Projects
Commit 580c84a5 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Do tutorial test without shoehorning in singularity

(cherry picked from commit 56cc8598)
parent 3430d471
Branches
No related tags found
1 merge request!201Add awkward-array package
...@@ -283,7 +283,7 @@ jug_xl:nightly: ...@@ -283,7 +283,7 @@ jug_xl:nightly:
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: never when: never
- when: on_success - when: manual
artifacts: artifacts:
expire_in: 1 days expire_in: 1 days
paths: paths:
...@@ -314,12 +314,6 @@ jug_xl:singularity:nightly: ...@@ -314,12 +314,6 @@ jug_xl:singularity:nightly:
needs: needs:
- version - version
- jug_xl: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
variables: variables:
BUILD_IMAGE: "jug_xl" BUILD_IMAGE: "jug_xl"
script: script:
...@@ -348,16 +342,21 @@ juggler:master: ...@@ -348,16 +342,21 @@ juggler:master:
allow_failure: true allow_failure: true
.test: .test:
image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_xl:${NIGHTLY_TAG}
stage: test stage: test
needs: needs:
- version - version
- jug_xl:singularity:nightly - jug_xl:nightly
rules: rules:
- if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "master"'
when: on_success when: on_success
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: on_success when: on_success
- when: never - when: never
before_script:
- echo "Testing the new container setup"
after_script:
- echo "Testing completed"
include: include:
- local: 'tests/tutorial/config.yml' - local: 'tests/tutorial/config.yml'
......
...@@ -5,15 +5,5 @@ ...@@ -5,15 +5,5 @@
test:tutorial: test:tutorial:
extends: .test extends: .test
script: script:
- mkdir eic && cd eic - tests/tutorial/quick-start.sh
- mkdir -p .gitlab-ci && mv ../build/jug_xl.sif .gitlab-ci/jug_xl-ci-test.sif - tests/tutorial/part1.sh
# 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment