diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7e4c8058a7fe3a97c0d03f9f2a2d9307e7e8895..66c266e3bc274460d3a3c2ae44dd0422ff48e5a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -584,26 +584,6 @@ juggler:master: project: EIC/juggler allow_failure: true -.test: - image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_xl:${NIGHTLY_TAG} - stage: test - 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 - before_script: - - echo "Testing the new container setup" - after_script: - - echo "Testing completed" - -include: - - local: 'tests/tutorial/config.yml' - cleanup: stage: finalize dependencies: diff --git a/tests/tutorial/config.yml b/tests/tutorial/config.yml deleted file mode 100644 index 068ad03789c7098b2452de05cb4ea3416364b7c4..0000000000000000000000000000000000000000 --- a/tests/tutorial/config.yml +++ /dev/null @@ -1,9 +0,0 @@ -## Ensure the container still works for the new container -## even with a strange environment setup - - -test:tutorial: - extends: .test - script: - - tests/tutorial/quick-start.sh - - tests/tutorial/part1.sh diff --git a/tests/tutorial/part1.sh b/tests/tutorial/part1.sh deleted file mode 100755 index 476a2df3bf3c8402e365d78f9520248443f530d6..0000000000000000000000000000000000000000 --- a/tests/tutorial/part1.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -source /opt/detector/setup.sh - -git clone https://eicweb.phy.anl.gov/EIC/tutorials/ip6_tutorial_1.git part1 -pushd part1 -cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$EIC_SHELL_PREFIX -DCMAKE_CXX_STANDARD=17 -cmake --build build -j4 -- install -dd_web_display --export gem_tracker.xml -checkOverlaps -t 0.0001 -c gem_tracker.xml -npdet_info dump gem_tracker.xml -npsim --runType run --enableG4GPS \ - --macroFile gps.mac \ - --compactFile ./gem_tracker.xml \ - --outputFile gem_tracker_sim.root - -root -b -q scripts/tutorial1_hit_position.cxx+ -root -b -q scripts/tutorial2_cell_size.cxx+ -popd diff --git a/tests/tutorial/quick-start.sh b/tests/tutorial/quick-start.sh deleted file mode 100755 index 6007a98f2fd20c71a255fa5870f108cd6a7a7d0c..0000000000000000000000000000000000000000 --- a/tests/tutorial/quick-start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -git clone https://eicweb.phy.anl.gov/EIC/detectors/athena.git -git clone https://eicweb.phy.anl.gov/EIC/detectors/ip6.git -ln -s ../ip6/ip6 athena/ip6 - -echo "PART 1: QUICK START" -pushd athena -source /opt/detector/setup.sh -dd_web_display --export athena.xml -popd