Merge branch 'hello-pipeline-fix-yet-again' into 'feature'

Hello pipeline fix yet again

See merge request mpp/mpp!459

.gitlab-ci.yml

@@ -114,7 +114,7 @@ trigger-fwi:
 # --------------------------------- benchmark ---------------------------------
 
 .notebook_template_tutorial:
-  extends: .notebook_template
+  extends: .notebook_template_docker_pde
   only:
     variables: [ $BENCHMARK == 'tutorial-notebooks' ]
   before_script:
@@ -150,6 +150,25 @@ acoustic-exercises-tutorial:
   variables:
     NOTEBOOK_NAME: 'Acoustic-Exercises'
 
+####
+test-on-unibw:
+  extends: .notebook_template_enroot_bwuni
+  only:
+    variables: [ $BENCHMARK == 'tutorial-notebooks' ]
+  before_script:
+    - cd tutorial/notebooks
+  variables:
+    NOTEBOOK_NAME: 'Introduction-Exercises'
+
+test-on-horeka:
+  extends: .notebook_template_enroot_horeka
+  only:
+    variables: [ $BENCHMARK == 'tutorial-notebooks' ]
+  before_script:
+    - cd tutorial/notebooks
+  variables:
+    NOTEBOOK_NAME: 'Introduction-Exercises'
+
 # ---------------------------------- deploy -----------------------------------
 
 deploy:

.mpp-ci-templates.yml

-# Global Variables
 .global-variables:
   OS: 'ubuntu'
   OS_VERSION: '20.04'
@@ -22,7 +21,7 @@ services:
   before_script:
     - docker info
     - docker login -u $MPP_REGISTRY_USER -p $MPP_REGISTRY_PASS ${MPP_REGISTRY}
-    - echo "build image - ${IMAGE_NAME}$"
+    - echo "build image - ${IMAGE_NAME}"
   script:
     - sed s/REGISTRY/${MPP_REGISTRY}\\/${MPP_REGISTRY_REPO_RELEASE}/g
       docker/${PROJECT_NAME}.baseimage >
@@ -83,7 +82,6 @@ services:
     GIT_SUBMODULE_STRATEGY: recursive
     NOTEBOOK_NAME: 'THIS_VARIABLE_HAS_TO_BE_SET'
     CELL_TIMEOUT: '1200'
-  image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_RELEASE}/mpp_dev_${OS}:${OS_VERSION}
   timeout: '1h'
   script:
     - jupyter nbconvert
@@ -93,8 +91,6 @@ services:
     - cp *.html $CI_PROJECT_DIR/
     - cp ../../build/data/vtu/* $CI_PROJECT_DIR/
     - cp ../../build/log/* $CI_PROJECT_DIR/
-  tags:
-    - docker
   artifacts:
     when: always
     paths:
@@ -102,6 +98,26 @@ services:
       - $CI_PROJECT_DIR/*.vtu
       - $CI_PROJECT_DIR/log*
 
+.notebook_template_docker_pde:
+  extends: .notebook_template
+  image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_RELEASE}/mpp_dev_${OS}:${OS_VERSION}
+  tags:
+    - docker
+
+.notebook_template_enroot_bwuni:
+  extends: .notebook_template
+  image: $MPP_REGISTRY_USER2:$MPP_REGISTRY_PASS@${MPP_REGISTRY}#${MPP_REGISTRY_REPO_RELEASE}/mpp_dev_${OS}:${OS_VERSION}
+  tags:
+    - enroot
+    - bwuni_test
+
+.notebook_template_enroot_horeka:
+  extends: .notebook_template
+  image: $MPP_REGISTRY_USER2:$MPP_REGISTRY_PASS@${MPP_REGISTRY}#${MPP_REGISTRY_REPO_RELEASE}/mpp_dev_${OS}:${OS_VERSION}
+  tags:
+    - enroot
+    - horeka_test
+
 # Todo add cmake args
 .benchmark_template:
   stage: benchmark
@@ -118,4 +134,20 @@ services:
     - post-process
   artifacts:
     - $CI_PROJECT_DIR/*.vtu
-    - $CI_PROJECT_DIR/log*
\ No newline at end of file
+    - $CI_PROJECT_DIR/log*
+
+.job_template: &benchmark_slurm
+  stage: benchmark
+  image: $MPP_REGISTRY_USER2:$MPP_REGISTRY_PASS@${MPP_REGISTRY}#${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MPP}
+  variables:
+    USE_NAME: "slurm_job"
+    SLURM_PARTITION: "dev_single"
+    SLURM_EXCLUSIVE: "ON"
+    SLURM_TIME: "00:30:00"
+  only:
+    variables:
+      - ($RUN_BENCHMARK == "true")
+  script:
+    - echo "Hier jetzt Benchmark Tests einfügen"
+
+