updated yml

.gitlab-ci.yml

@@ -5,10 +5,6 @@ stages:
 build-mlmc:
   stage: build
 
-  except:
-    variables:
-      - $CI_PIPELINE_SOURCE == "pipeline"
-
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
 
@@ -22,46 +18,15 @@ build-mlmc:
     - ./configure --with-mpi=yes --with-fortran=no
     - make -j
     - cd ..
-    - mkdir build
-    - cd build
-    - cmake .. #-DBUILD_TESTS=OFF
-    - make -j
-
-  artifacts:
-    paths:
-      - build/mpp/src
-      - build/mpp/LIB_PS
-      - build/mpp/googletest
-      - build/mlmc
-      - sprng5
-    expire_in: '1h'
-
-downstream-build-mlmc:
-  stage: build
-
-  only:
-    variables:
-      - $CI_PIPELINE_SOURCE == "pipeline"
-
-  variables:
-    GIT_SUBMODULE_STRATEGY: recursive
 
-  before_script:
-    - module add foss
-    - module add Anaconda3
-
-  script:
-    - tar xjf sprng5.tar.bz2
-    - cd sprng5
-    - ./configure --with-mpi=yes --with-fortran=no
-    - make -j
+    - cd mpp
+    - git fetch --all
+    - git checkout $UPSTREAM_COMMIT
     - cd ..
     - mkdir build
     - cd build
-    - "curl -SL
-         https://git.scc.kit.edu/mpp/mpp/-/jobs/artifacts/feature/download?job=build-mpp"
-    - unzip build.zip
-    - ls
+    - cmake ..
+    - make -j
 
   artifacts:
     paths:
@@ -69,61 +34,22 @@ downstream-build-mlmc:
       - build/mpp/LIB_PS
       - build/mpp/googletest
       - build/mlmc
-    expire_in: '1h'
-
-  cache:
-    paths:
       - sprng5
+    expire_in: '1h'
 
-program-test:
-  stage: test
-
-  except:
-    variables:
-      - $CI_PIPELINE_SOURCE == "pipeline"
-
-  before_script:
-    - module add foss
-    - module add Anaconda3
-
-  script:
-    - cd build
-    - cmake ..
-    - make -j
-    - cd tests
-    - mpirun -n 4 TestMainProgram
-    - mpirun -n 4 TestMultilevelPlotter
-
-downstream-program-test:
+test-mlmc:
   stage: test
 
-  only:
-    variables:
-      - $CI_PIPELINE_SOURCE == "pipeline"
-
   before_script:
     - module add foss
     - module add Anaconda3
-    - tar xjf sprng5.tar.bz2
-    - cd sprng5
-    - ./configure --with-mpi=yes --with-fortran=no
-    - make -j
-    - cd ..
-    - cd mpp
-    - git fetch
-    - git pull origin feature
-    - cd ..
-    - mkdir build
-    - cd build
-    - cmake ..
-    - make -j
 
   script:
-    - cd build
-    - cmake ..
-    - make -j
     - cd tests
     - mpirun -n 4 TestMainProgram
     - mpirun -n 4 TestMultilevelPlotter
+    - touch build/dummy_results.txt
 
-
+  artifacts:
+    paths:
+      - build/dummy_results.txt
\ No newline at end of file

mpp @ 454b99a0

-Subproject commit d558f38a95852eb7f8f2a2d62d4ef10c4b5def6a
+Subproject commit 454b99a0e475a0b75c54ea3b5cc67a2e42e06fe3