Merge branch 'develop' into feat/sched_option_sbatch

ekouts · Jun 13, 2024 · a17d83e · a17d83e
2 parents 809cba4 + be710fa
commit a17d83e
Show file tree

Hide file tree

Showing 195 changed files with 6,224 additions and 7,269 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,11 +27,6 @@ jobs:
         python -m pip install coverage
         coverage run --source=reframe ./test_reframe.py
         coverage report -m
-    - name: Upload Coverage to Codecov
-      if:  matrix.python-version == '3.8'
-      uses: codecov/codecov-action@v4
-      with:
-        fail_ci_if_error: true
 
   unittest-py36:
     runs-on: ubuntu-20.04
@@ -86,7 +81,7 @@ jobs:
       run: |
         docker run reframe-${{ matrix.modules-version }}:latest
 
-  tutorialtest:
+  eb-spack-howto:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -99,7 +94,7 @@ jobs:
     - name: Build Image for Tutorial Tests
       run: |
         echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-        docker build -f ci-scripts/dockerfiles/tutorials.dockerfile -t reframe-tutorials:latest .
+        docker build -f ci-scripts/dockerfiles/eb-spack-howto.dockerfile -t reframe-tutorials:latest .
         docker logout
     - name: Run Tutorial Tests
       run: |

diff --git a/.github/workflows/test-flux.yaml b/.github/workflows/test-flux.yaml
@@ -38,6 +38,6 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           which reframe
-          flux start reframe -c tutorials/flux -C tutorials/flux/settings.py -l
-          flux start reframe -c tutorials/flux -C tutorials/flux/settings.py --run
-          flux start python3 ./test_reframe.py --rfm-user-config=tutorials/flux/settings.py -vvvv
+          flux start reframe -c examples/howto/flux -C examples/howto/flux/settings.py -l
+          flux start reframe -c examples/howto/flux -C examples/howto/flux/settings.py -r
+          flux start python3 ./test_reframe.py --rfm-user-config=examples/howto/flux/settings.py -vvvv
diff --git a/ci-scripts/dockerfiles/tutorials.dockerfile → ...pts/dockerfiles/eb-spack-howto.dockerfile b/ci-scripts/dockerfiles/tutorials.dockerfile → ...pts/dockerfiles/eb-spack-howto.dockerfile
@@ -37,4 +37,4 @@ RUN echo '. /usr/local/lmod/lmod/init/profile && . /home/rfmuser/spack/share/spa
 
 ENV BASH_ENV /home/rfmuser/setup.sh
 
-CMD ["/bin/bash", "-c", "./bin/reframe -r -C tutorials/config/lmodsys.py -R -c tutorials/build_systems"]
+CMD ["/bin/bash", "-c", "./bin/reframe --system=tutorialsys -r -C examples/tutorial/config/baseline_modules.py -R -c examples/tutorial/easybuild/eb_test.py -c examples/tutorial/spack/spack_test.py"]
diff --git a/docs/_static/img/reframe-system-arch.svg b/docs/_static/img/reframe-system-arch.svg
diff --git a/docs/_static/img/test-naming.svg b/docs/_static/img/test-naming.svg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,4 +37,4 @@ RUN echo '. /usr/local/lmod/lmod/init/profile && . /home/rfmuser/spack/share/spa

		ENV BASH_ENV /home/rfmuser/setup.sh

		CMD ["/bin/bash", "-c", "./bin/reframe -r -C tutorials/config/lmodsys.py -R -c tutorials/build_systems"]
		CMD ["/bin/bash", "-c", "./bin/reframe --system=tutorialsys -r -C examples/tutorial/config/baseline_modules.py -R -c examples/tutorial/easybuild/eb_test.py -c examples/tutorial/spack/spack_test.py"]