CI+tests stuff

AFD-Illinois · Oct 6, 2023 · 0a6585f · 0a6585f
1 parent 61de2e2
commit 0a6585f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/scripts/ci/cpu.yml b/scripts/ci/cpu.yml
@@ -3,7 +3,7 @@
 image: quay.io/centos/centos:stream9
 
 variables:
-  OMP_NUM_THREADS: 4
+  OMP_NUM_THREADS: 8
   OMP_PROC_BIND: "false"
   MPI_EXE: mpirun
   MPI_NUM_PROCS: 2
@@ -40,13 +40,15 @@ build:
   variables:
     NPROC: 8
     HOST_ARCH: NATIVE
+    C_NATIVE: gcc
+    CXX_NATIVE: g++
   before_script:
     - dnf -y groupinstall "Development Tools"
-    - dnf -y install hostname environment-modules cmake mpich-devel hdf5-mpich-devel fftw-devel
+    - dnf -y install hostname environment-modules cmake mpich-devel fftw-devel
     - source /etc/profile
     - module load mpi/mpich-x86_64
   script:
-    - ./make.sh clean
+    - ./make.sh clean hdf5
   artifacts:
     paths:
       - kharma.*

diff --git a/tests/clean_tests.sh b/tests/clean_tests.sh
@@ -2,4 +2,7 @@
 # Cleans all temporary/gitignore files from tests
 
 TEST_DIR=$(dirname "$(readlink -f "$0")")
-rm -rf ${TEST_DIR}/*/*.{phdf,xdmf,rhdf,h5,hst,txt,png} ${TEST_DIR}/tilt_init/mks ${TEST_DIR}/*/frames_* ${TEST_DIR}/*/kharma_parsed_parameters*
+rm -rf ${TEST_DIR}/*/*.{phdf,xdmf,rhdf,h5,hst,txt,png} \
+       ${TEST_DIR}/tilt_init/mks \
+       ${TEST_DIR}/*/frames_* \
+       ${TEST_DIR}/*/kharma_parsed_parameters*