diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac6e620676f41dae010db5d79ea71075d63eaba1..a5082bb71368185357b42e3a5d0ae6613c6ba14e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,10 +54,10 @@ checks: automated_test: variables: - OUTPUT: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - REFERENCE: REFERENCE - DETECTOR: epix100 - CALIBRATION: dark + OUTPUT: reference_folder # $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + REFERENCE: reference_folder + DETECTORS: all + CALIBRATION: all stage: automated_test only: [merge_requests] when: manual @@ -67,8 +67,8 @@ automated_test: - export LANG=C # Hopefully detect anything relying on locale - python3 -m pip install ".[automated_test]" - echo "Running automated test. This can take sometime to finish depending on the test data." - - echo "Given variables are REFERENCE=$REFERENCE, OUTPUT=$OUTPUT, DETECTOR=$DETECTOR, CALIBRATION=$CALIBRATION" - - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder /gpfs/exfel/data/scratch/xcaltst/test/$REFERENCE --out-folder /gpfs/exfel/data/scratch/xcaltst/test/$OUTPUT --detectors $DETECTOR --calibration $CALIBRATION + - echo "Given variables are REFERENCE=$REFERENCE, OUTPUT=$OUTPUT, DETECTOR=$DETECTORS, CALIBRATION=$CALIBRATION" + - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder /gpfs/exfel/data/scratch/xcaltst/test/$REFERENCE --out-folder /gpfs/exfel/data/scratch/xcaltst/test/$OUTPUT --detectors $DETECTORS --calibration $CALIBRATION # cython-editable-install-test: # stage: test