Merge pull request #991 from markusbattarbee/update_CI_reference_data…

…_runner Update ci reference data runner
fmihpc · Jun 13, 2024 · 36516c6 · 36516c6
2 parents 8f92dde + 6103734
commit 36516c6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/.github/workflows/generate-reference-data.yml b/.github/workflows/generate-reference-data.yml
@@ -1,4 +1,4 @@
-name: Generate testpackage reference data
+name: Generate testpackage reference data on Carrington
 
 on:
   # Only run when triggered manually
@@ -12,22 +12,34 @@ jobs:
     runs-on: carrington
 
     steps:
+    - name: Clean workspace
+      run: |
+        RUN_STRING=$( cat << MORO
+        rm -rf libraries library-build testpackage
+        rm -f libraries.tar.zst testpackage_check_description.txt testpackage-output.tar.gz metrics.txt stdout.txt stderr.txt testpackage_output_variables.txt
+        rm -f *.xml
+        MORO
+        )
+        srun -M carrington bash -c "$RUN_STRING"
     - name: Checkout source
-      uses: actions/checkout@v3 
+      uses: actions/checkout@v4
       with:
         submodules: true
     - name: Make clean
       run: VLASIATOR_ARCH=carrington_gcc_openmpi make clean
     - uses: ursg/gcc-problem-matcher@master
     - name: Compile vlasiator (Testpackage build)
       run: |
-        export VLASIATOR_ARCH=carrington_gcc_openmpi
-        srun -M carrington --job-name tp_compile --interactive --nodes=1 -n 1 -c 16 --mem=40G -p short -t 0:10:0 bash -c 'module purge; module load GCC/11.2.0; module load OpenMPI/4.1.1-GCC-11.2.0 ; module load PMIx/4.1.0-GCCcore-11.2.0; module load PAPI/6.0.0.1-GCCcore-11.2.0; export VLASIATOR_ARCH=carrington_gcc_openmpi; make -j 16 testpackage; sleep 10s'
-    - name: Sleep for 10 seconds
-      run: sleep 10s
-      shell: bash
+        srun -M carrington --job-name CI_ref_tp_compile --interactive --nodes=1 -n 1 -c 16 --mem=40G -p short -t 0:10:0 bash -c 'module purge; module load GCC/11.2.0; module load OpenMPI/4.1.1-GCC-11.2.0 ; module load PMIx/4.1.0-GCCcore-11.2.0; module load PAPI/6.0.0.1-GCCcore-11.2.0; export VLASIATOR_ARCH=carrington_gcc_openmpi; make -j 16 testpackage; sleep 10s'
+    - name: Make sure the output binary is visible in lustre
+      uses: nick-fields/retry@v3
+      with:
+        timeout_seconds: 15
+        max_attempts: 3
+        retry_on: error
+        command: ls vlasiator
     - name: Upload testpackage binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: vlasiator-testpackage
         path: vlasiator
@@ -45,11 +57,11 @@ jobs:
 
     steps:
     - name: Checkout source
-      uses: actions/checkout@v3 
+      uses: actions/checkout@v4
       with:
         submodules: true
     - name: Download testpackage binary
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: vlasiator-testpackage
     - name: Run testpackage

diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
@@ -130,9 +130,13 @@ jobs:
     steps:
     - name: Clean workspace
       run: |
+        RUN_STRING=$( cat << MORO
         rm -rf libraries library-build testpackage
         rm -f libraries.tar.zst testpackage_check_description.txt testpackage-output.tar.gz metrics.txt stdout.txt stderr.txt testpackage_output_variables.txt
         rm -f *.xml
+        MORO
+        )
+        srun -M carrington bash -c "$RUN_STRING"
     - name: Checkout source
       uses: actions/checkout@v4
       with:
@@ -175,8 +179,8 @@ jobs:
     - name: Clean workspace
       run: |
         rm -rf libraries library-build libraries-arriesgado.tar.gz
-        rm -rf stdout.txt stderr.txt metrics.txt
-        rm -rf *.xml
+        rm -f stdout.txt stderr.txt metrics.txt
+        rm -f *.xml
     - name: Download libraries
       uses: actions/download-artifact@v4
       with:
@@ -240,9 +244,13 @@ jobs:
     steps:
     - name: Clean workspace
       run: |
+        RUN_STRING=$( cat << MORO
         rm -rf libraries library-build testpackage
         rm -f libraries.tar.zstd testpackage_check_description.txt testpackage-output.tar.gz metrics.txt stdout.txt stderr.txt testpackage_output_variables.txt
         rm -f *.xml
+        MORO
+        )
+        srun -M carrington bash -c "$RUN_STRING"
     - name: Checkout source
       uses: actions/checkout@v4
       with: