Skip to content

Commit 9869e0f

Browse files
svalatsvalat
committed
ci: fix keeping usage of the wrapper script run-tests to load the intel env
1 parent 6e5adf9 commit 9869e0f

2 files changed

Lines changed: 46 additions & 47 deletions

File tree

‎.github/workflows/idefix-ci-jobs.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
submodules: recursive
3434
persist-credentials: false
3535
- name: Sod test
36-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/sod $TESTME_OPTIONS
36+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod $TESTME_OPTIONS
3737
- name: Isothermal Sod test
38-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/sod-iso $TESTME_OPTIONS
38+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod-iso $TESTME_OPTIONS
3939
- name: Mach reflection test
40-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/MachReflection $TESTME_OPTIONS
40+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/MachReflection $TESTME_OPTIONS
4141
- name: Sedov blast wave
42-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/SedovBlastWave $TESTME_OPTIONS
42+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/SedovBlastWave $TESTME_OPTIONS
4343

4444
ParabolicHydro:
4545
runs-on: self-hosted
@@ -50,11 +50,11 @@ jobs:
5050
submodules: recursive
5151
persist-credentials: false
5252
- name: Viscous flow past cylinder
53-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder $TESTME_OPTIONS
53+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder $TESTME_OPTIONS
5454
- name: Viscous disk
55-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/ViscousDisk $TESTME_OPTIONS
55+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousDisk $TESTME_OPTIONS
5656
- name: Thermal diffusion
57-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/thermalDiffusion $TESTME_OPTIONS
57+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/thermalDiffusion $TESTME_OPTIONS
5858

5959
ShocksMHD:
6060
runs-on: self-hosted
@@ -65,17 +65,17 @@ jobs:
6565
submodules: recursive
6666
persist-credentials: false
6767
- name: MHD Sod test
68-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sod $TESTME_OPTIONS
68+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod $TESTME_OPTIONS
6969
- name: MHD Isothermal Sod test
70-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sod-iso $TESTME_OPTIONS
70+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod-iso $TESTME_OPTIONS
7171
- name: Orszag Tang
72-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/OrszagTang $TESTME_OPTIONS
72+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang $TESTME_OPTIONS
7373
- name: Orszag Tang 3D
74-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/OrszagTang3D $TESTME_OPTIONS
74+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang3D $TESTME_OPTIONS
7575
- name: Linear wave test
76-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/LinearWaveTest $TESTME_OPTIONS
76+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/LinearWaveTest $TESTME_OPTIONS
7777
- name: Axis Flux tube
78-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AxisFluxTube $TESTME_OPTIONS
78+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AxisFluxTube $TESTME_OPTIONS
7979

8080
ParabolicMHD:
8181
runs-on: self-hosted
@@ -86,15 +86,15 @@ jobs:
8686
submodules: recursive
8787
persist-credentials: false
8888
- name: Ambipolar C Shock
89-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AmbipolarCshock $TESTME_OPTIONS
89+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock $TESTME_OPTIONS
9090
- name: Ambipolar C Shock 3D
91-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AmbipolarCshock3D $TESTME_OPTIONS
91+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock3D $TESTME_OPTIONS
9292
- name: Resistive Alfvén wave
93-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave $TESTME_OPTIONS
93+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave $TESTME_OPTIONS
9494
- name: Grid coarsening diffusion
95-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/Coarsening $TESTME_OPTIONS
95+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/Coarsening $TESTME_OPTIONS
9696
- name: Hall whistler waves
97-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/HallWhistler $TESTME_OPTIONS
97+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/HallWhistler $TESTME_OPTIONS
9898

9999
Fargo:
100100
needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -106,9 +106,9 @@ jobs:
106106
submodules: recursive
107107
persist-credentials: false
108108
- name: Fargo + planet
109-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/FargoPlanet $TESTME_OPTIONS
109+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/FargoPlanet $TESTME_OPTIONS
110110
- name: Fargo MHD spherical
111-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/FargoMHDSpherical $TESTME_OPTIONS
111+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/FargoMHDSpherical $TESTME_OPTIONS
112112

113113
ShearingBox:
114114
needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -120,9 +120,9 @@ jobs:
120120
submodules: recursive
121121
persist-credentials: false
122122
- name: Hydro shearing box
123-
run: ./test.py -subdir $IDEFIX_DIR/test/HD/ShearingBox $TESTME_OPTIONS
123+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ShearingBox $TESTME_OPTIONS
124124
- name: MHD shearing box
125-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/ShearingBox $TESTME_OPTIONS
125+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ShearingBox $TESTME_OPTIONS
126126

127127
SelfGravity:
128128
needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -134,15 +134,15 @@ jobs:
134134
submodules: recursive
135135
persist-credentials: false
136136
- name: Jeans Instability
137-
run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/JeansInstability $TESTME_OPTIONS
137+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/JeansInstability $TESTME_OPTIONS
138138
- name: Random sphere spherical
139-
run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/RandomSphere $TESTME_OPTIONS
139+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphere $TESTME_OPTIONS
140140
- name: Random sphere cartesian
141-
run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian $TESTME_OPTIONS
141+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian $TESTME_OPTIONS
142142
- name: Uniform spherical collapse
143-
run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/UniformCollapse $TESTME_OPTIONS
143+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/UniformCollapse $TESTME_OPTIONS
144144
- name: Dusty spherical collapse
145-
run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/DustyCollapse $TESTME_OPTIONS
145+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/DustyCollapse $TESTME_OPTIONS
146146

147147
Planet:
148148
needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -154,17 +154,17 @@ jobs:
154154
submodules: recursive
155155
persist-credentials: false
156156
- name: 3 body
157-
run: ./test.py -subdir $IDEFIX_DIR/test/Planet/Planet3Body $TESTME_OPTIONS
157+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/Planet3Body $TESTME_OPTIONS
158158
- name: migration
159-
run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetMigration2D $TESTME_OPTIONS
159+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetMigration2D $TESTME_OPTIONS
160160
- name: planet-planet
161-
run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D $TESTME_OPTIONS
161+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D $TESTME_OPTIONS
162162
- name: spiral wake
163-
run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetSpiral2D $TESTME_OPTIONS
163+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetSpiral2D $TESTME_OPTIONS
164164
- name: torques
165-
run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetTorque3D $TESTME_OPTIONS
165+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetTorque3D $TESTME_OPTIONS
166166
- name: RK5
167-
run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D $TESTME_OPTIONS
167+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D $TESTME_OPTIONS
168168

169169
Dust:
170170
needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -176,9 +176,9 @@ jobs:
176176
submodules: recursive
177177
persist-credentials: false
178178
- name: Energy conservation
179-
run: ./test.py -subdir $IDEFIX_DIR/test/Dust/DustEnergy $TESTME_OPTIONS
179+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustEnergy $TESTME_OPTIONS
180180
- name: Dusty wave
181-
run: ./test.py -subdir $IDEFIX_DIR/test/Dust/DustyWave $TESTME_OPTIONS
181+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustyWave $TESTME_OPTIONS
182182

183183
Braginskii:
184184
needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -190,13 +190,13 @@ jobs:
190190
submodules: recursive
191191
persist-credentials: false
192192
- name: MTI
193-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/MTI $TESTME_OPTIONS
193+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/MTI $TESTME_OPTIONS
194194
- name: Spherical anisotropic diffusion
195-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sphBragTDiffusion $TESTME_OPTIONS
195+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragTDiffusion $TESTME_OPTIONS
196196
- name: Spherical anisotropic viscosity
197-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sphBragViscosity $TESTME_OPTIONS
197+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragViscosity $TESTME_OPTIONS
198198
- name: Collisionless thermal conduction
199-
run: ./test.py -subdir $IDEFIX_DIR/test/MHD/clessTDiffusion $TESTME_OPTIONS
199+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/clessTDiffusion $TESTME_OPTIONS
200200

201201
Examples:
202202
needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity]
@@ -220,11 +220,11 @@ jobs:
220220
submodules: recursive
221221
persist-credentials: false
222222
- name: Lookup table
223-
run: ./test.py -subdir $IDEFIX_DIR/test/utils/lookupTable $TESTME_OPTIONS
223+
run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/lookupTable $TESTME_OPTIONS
224224
- name: Dump Image
225-
run: ./test.py -subdir $IDEFIX_DIR/test/utils/dumpImage $TESTME_OPTIONS
225+
run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/dumpImage $TESTME_OPTIONS
226226
- name: Column density
227-
run: ./test.py -subdir $IDEFIX_DIR/test/utils/columnDensity $TESTME_OPTIONS
227+
run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/columnDensity $TESTME_OPTIONS
228228

229229
IOs:
230230
needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity]
@@ -236,13 +236,13 @@ jobs:
236236
submodules: recursive
237237
persist-credentials: false
238238
- name: Restart dumps
239-
run: ./test.py -subdir $IDEFIX_DIR/test/IO/dump $TESTME_OPTIONS
239+
run: scripts/ci/run-tests $IDEFIX_DIR/test/IO/dump $TESTME_OPTIONS
240240
- name: Pydefix
241241
run: |
242242
python3 -m venv $IDEFIX_DIR/test/IO/pydefix/env
243243
source $IDEFIX_DIR/test/IO/pydefix/env/bin/activate
244244
python3 -m pip install -r $IDEFIX_DIR/test/IO/pydefix/python_requirements.txt
245-
./test.py -subdir $IDEFIX_DIR/test/IO/pydefix $TESTME_OPTIONS
245+
scripts/ci/run-tests $IDEFIX_DIR/test/IO/pydefix $TESTME_OPTIONS
246246
247247
- name: xdmf
248-
run: ./test.py -subdir $IDEFIX_DIR/test/IO/xdmf $TESTME_OPTIONS
248+
run: scripts/ci/run-tests $IDEFIX_DIR/test/IO/xdmf $TESTME_OPTIONS

‎scripts/ci/run-tests‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ if [ "$IDEFIX_COMPILER" == icc ]; then
33
source /opt/intel/oneapi/setvars.sh
44
fi
55
set -ue
6-
cd "$1"
7-
./testme.py "${@:2}"
6+
./test.py -subdir "${@}"

0 commit comments

Comments
 (0)