diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec70180bd688808590211765e3912f2b378d950f..1be61133a74bad0ea5583350c9136264bd0c32f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
stages:
- - configure
- trigger
- downstream modules
@@ -12,42 +11,10 @@ variables:
workflow:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
-
-################################################################################
-# Stage 1: configure the test pipeline. #
-# This creates the .yml to be used for the test pipeline trigger stage. Within #
-# merge request, we create a .yml file that adds a test selection stage before #
-# the build stage to identify the tests affected by changes introduced in the #
-# merge request. In all other cases, we use the default which runs all tests. #
-################################################################################
-select-pipeline:
- image: $IMAGE_REGISTRY_URL/full:dune-2.7-gcc-ubuntu-20.04
- stage: configure
- script:
- - |
- if [ $CI_PIPELINE_SOURCE == "merge_request_event" ]; then
- cp .gitlab-ci/affectedtestsonly.yml pipeline-config.yml
- else
- cp .gitlab-ci/default.yml pipeline-config.yml
- fi
- artifacts:
- paths:
- - pipeline-config.yml
- expire_in: 3 hours
- rules:
- - if: $CI_PIPELINE_SOURCE == "schedule"
- when: always
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- when: manual
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: manual
-
-
###################################################################################
-# Stage 2: trigger the Dumux test pipelines #
+# Stage 1: trigger the Dumux test pipelines #
# In this stage, we trigger the test pipeline with different configurations, i.e. #
# different Dune versions, compilers, etc. Within merge requests, we create three #
# test pipelines including two different compilers and a full and minimal setup #
@@ -57,13 +24,14 @@ select-pipeline:
# basic trigger job to start the test pipeline
.base-trigger:
stage: trigger
- needs:
- - select-pipeline
trigger:
- include:
- - artifact: pipeline-config.yml
- job: select-pipeline
+ include: .gitlab-ci/default.yml
strategy: depend
+ variables:
+ TRIGGER_SOURCE: $CI_PIPELINE_SOURCE
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: manual
# trigger for jobs that should not be created in merge requests
.non-mr-trigger:
@@ -102,7 +70,7 @@ full-dune-master-clang:
#########################################################
-# Stage 3: trigger test pipelines of downstream modules #
+# Stage 2: trigger test pipelines of downstream modules #
#########################################################
# trigger lecture test
diff --git a/.gitlab-ci/affectedtestsonly.yml b/.gitlab-ci/affectedtestsonly.yml
deleted file mode 100644
index 7387f722f4c223ff448769b8416c28b2f92e51d2..0000000000000000000000000000000000000000
--- a/.gitlab-ci/affectedtestsonly.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-default:
- image: $IMAGE
-
-stages:
- - configure
- - build
- - test
-
-workflow:
- rules:
- - if: $CI_PIPELINE_SOURCE=="parent_pipeline"
-
-select tests:
- stage: configure
- script:
- - dunecontrol --opts=$DUNE_OPTS_FILE --current all
- - |
- pushd build-cmake
- python3 ../bin/testing/findtests.py -f affectedtests.json -t origin/master
- popd
- artifacts:
- paths:
- - build-cmake
- expire_in: 3 hours
-
-build dumux:
- stage: build
- script:
- - |
- pushd build-cmake
- make clean
- python3 ../bin/testing/runselectedtests.py -c affectedtests.json -b
- popd
- artifacts:
- paths:
- - build-cmake
- expire_in: 3 hours
- needs:
- - job: select tests
- artifacts: true
-
-test dumux:
- stage: test
- script:
- - |
- pushd build-cmake
- python3 ../bin/testing/runselectedtests.py -c affectedtests.json -t
- popd
- needs:
- - job: build dumux
- artifacts: true
- artifacts:
- reports:
- junit: junit/dumux-cmake.xml
diff --git a/.gitlab-ci/default.yml b/.gitlab-ci/default.yml
index 2293458b024c62ae335be46a4f5d4e57166e35ab..d0953e17ba3bb2e0924a596ed507d52bd7154f5c 100644
--- a/.gitlab-ci/default.yml
+++ b/.gitlab-ci/default.yml
@@ -2,6 +2,7 @@ default:
image: $IMAGE
stages:
+ - configure
- build
- test
@@ -9,20 +10,60 @@ workflow:
rules:
- if: $CI_PIPELINE_SOURCE=="parent_pipeline"
+variables:
+ TRIGGER_SOURCE: "unknown"
+
+select tests:
+ stage: configure
+ image: $IMAGE_REGISTRY_URL/full:dune-2.7-gcc-ubuntu-20.04
+ script:
+ - |
+ if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
+ dunecontrol --opts=$DUNE_OPTS_FILE --current all
+ pushd build-cmake
+ python3 ../bin/testing/findtests.py -f ../affectedtests.json -t origin/master
+ popd
+ else
+ echo "Skipping test selection, build/test stages will consider all tests!"
+ echo "{}" >> ../affectedtests.json
+ fi
+ artifacts:
+ paths:
+ - affectedtests.json
+ expire_in: 3 hours
+
build dumux:
stage: build
script:
- dunecontrol --opts=$DUNE_OPTS_FILE --current all
- - dunecontrol --opts=$DUNE_OPTS_FILE --current bexec make -k -j4 build_tests
+ - |
+ pushd build-cmake
+ if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
+ python3 ../bin/testing/runselectedtests.py -c ../affectedtests.json -b
+ else
+ python3 ../bin/testing/runselectedtests.py --all -b
+ fi
+ popd
artifacts:
paths:
- build-cmake
+ - affectedtests.json
expire_in: 3 hours
+ needs:
+ - job: select tests
+ artifacts: true
test dumux:
stage: test
script:
- - dunecontrol --opts=$DUNE_OPTS_FILE --current bexec dune-ctest -j4 --output-on-failure
+ - |
+ pushd build-cmake
+ if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
+ python3 ../bin/testing/runselectedtests.py -c ../affectedtests.json -t
+ else
+ python3 ../bin/testing/runselectedtests.py --all -t
+ fi
+ popd
needs:
- job: build dumux
artifacts: true