simplify ci

.gitlab-ci.yml

@@ -54,9 +54,9 @@ check-clang-format:
 ####### CONFIG ##############
 
 ##########################################################
+# the generic config template job
 # job/stage to just prepare cmake
-config-u-18_04:
-  image: corsika/devel:u-18.04
+.config
   stage: config
   tags:
     - corsika
@@ -75,38 +75,24 @@ config-u-18_04:
     paths:
        - build
 
-##########################################################
-# job/stage to just prepare cmake
+# config for gcc
+config-u-18_04:
+  extends: .config
+  image: corsika/devel:u-18.04
+
+# config for clang
 config-clang-8:
+  extends: .config
   image: corsika/devel:clang-8
-  stage: config
-  tags:
-    - corsika
-  variables:
-    CORSIKA_DATA: "${CI_BUILDS_DIR}/AirShowerPhysics/corsika/corsika-data/"
-  script:
-    - mkdir build
-    - cd build
-#    - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_PYTHIA=ON
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  artifacts:
-    expire_in: 1 day
-    paths:
-       - build
 
 
 
 ####### BUILD  ##############
 
 ##########################################################
+# the generic build template job
 # normal pipeline for each commit
-build-u-18_04: 
-  image: corsika/devel:u-18.04
-  dependencies:
-    - config-u-18_04
+.build
   stage: build
   tags:
     - corsika
@@ -124,39 +110,27 @@ build-u-18_04:
     paths:
       - build
 
-##########################################################
-# normal pipeline for each commit
+# build for gcc
+build-u-18_04:
+  extends: .build
+  image: corsika/devel:u-18.04
+  dependencies:
+    - config-u-18_04
+
+# build for clang
 build-clang-8: 
+  extends: .build
   image: corsika/devel:clang-8
   dependencies:
     - config-clang-8
-  stage: build
-  tags:
-    - corsika
-  variables:
-    CORSIKA_DATA: "${CI_PROJECT_DIR}/corsika-data/"
-  script:
-    - cd build
-#    - cmake --build . -- -j4
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  artifacts:
-    expire_in: 4 hours
-    reports:
-    paths:
-      - build
 
 
 ####### TEST  ##############
 
 ##########################################################
+# generic test template job
 # normal pipeline for each commit
-test-u-18_04: 
-  image: corsika/devel:u-18.04
-  dependencies:
-    - build-u-18_04
+.test
   stage: test
   tags:
     - corsika
@@ -180,45 +154,28 @@ test-u-18_04:
 #    paths:
 #      - build/test.log.gz
 
-##########################################################
-# normal pipeline for each commit
-test-clang-8: 
+# test for gcc
+test-u-18_04:
+  extends: .test
+  image: corsika/devel:u-18.04
+  dependencies:
+    - build-u-18_04
+
+# test for clang
+test-clang-8:
+  extends: .test
   image: corsika/devel:clang-8
   dependencies:
     - build-clang-8
-  stage: test
-  tags:
-    - corsika
-  variables:
-    CORSIKA_DATA: "${CI_PROJECT_DIR}/corsika-data/"
-  script:
-#    - git clone https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika-data.git
-    - cd build
-    - set -o pipefail
-#    - ctest -VV | gzip -v -9 > test.log.gz 
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-#  artifacts:
-#    when: always
-#    expire_in: 3 days
-#    reports:
-#      junit:
-#        - build/test_outputs/junit*.xml
-#    paths:
-#      - build/test.log.gz
 
 
 
 ####### EXAMPLE  ##############
 
 ##########################################################
+# generic example template job
 # normal pipeline for each commit
-example-u-18_04: 
-  image: corsika/devel:u-18.04
-  dependencies:
-    - build-u-18_04
+.example
   stage: example
   tags:
     - corsika
@@ -239,42 +196,28 @@ example-u-18_04:
 #    paths:
 #      - build/examples.log.gz
 
-##########################################################
-# normal pipeline for each commit
-example-clang-8: 
+# example for gcc
+example-u-18_04: 
+  extends: .example
+  image: corsika/devel:u-18.04
+  dependencies:
+    - build-u-18_04
+
+# example for clang
+example-clang-8:
+  extends: .example
   image: corsika/devel:clang-8
   dependencies:
     - build-clang-8
-  stage: example
-  tags:
-    - corsika
-  variables:
-    CORSIKA_DATA: "${CI_PROJECT_DIR}/corsika-data/"
-  script:
-#    - git clone https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika-data.git
-    - cd build
-    - set -o pipefail
-#    - make run_examples | gzip -v -9 > examples.log.gz
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-#  artifacts:
-#    when: always
-#    expire_in: 3 days
-#    paths:
-#      - build/examples.log.gz
 
 
 
 ####### OPTIONAL ##############
 
 ##########################################################
+# generic release template job
 # optional release pipeline for each commit
-release-full-u-18_04: 
-  image: corsika/devel:u-18.04
-  dependencies:
-    - config-u-18_04
+.release
   stage: optional
   tags:
     - corsika
@@ -308,44 +251,19 @@ release-full-u-18_04:
 #    paths:
 #      - build/test.log.gz
 
-##########################################################
-# optional release pipeline for each commit
+# release for gcc
+release-full-u-18_04:
+  extends: .release
+  image: corsika/devel:u-18.04
+  dependencies:
+    - config-u-18_04
+
+# release for clang
 release-full-clang-8: 
+  extends: .release
   image: corsika/devel:clang-8
   dependencies:
     - config-clang-8
-  stage: optional
-  tags:
-    - corsika
-  variables:
-    CORSIKA_DATA: "${CI_PROJECT_DIR}/corsika-data/"
-  script:
-#    - git clone https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika-data.git
-    - cd build
-#    - cmake .. -DCMAKE_BUILD_TYPE=Release
-#    - cmake --build . -- -j4
-    - set -o pipefail
-#    - ctest -VV | gzip -v -9 > test.log.gz
-#    - make run_examples
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /Ready for code review/' # run on merge requests, if label 'Ready for code review' is set
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: manual
-      allow_failure: true
-    - if: $CI_MERGE_REQUEST_ID
-      when: manual
-      allow_failure: true
-    - if: $CI_COMMIT_TAG
-      when: manual
-      allow_failure: true
-#  artifacts:
-#    when: always
-#    expire_in: 3 days
-#    reports:
-#      junit:
-#        - build/test_outputs/junit*.xml
-#    paths:
-#      - build/test.log.gz
 
 ##########################################################
 # the coverage generation should either run when manually requested, OR always on the master