Skip to content

Commit

Permalink
Remove pinned tests and use balfrin agent (#40)
Browse files Browse the repository at this point in the history 
* remove pinned tests and use balfrin agent

* Updated plot references.

---------

Co-authored-by: Pirmin Kaufmann <[email protected]>
  • Loading branch information
@victoria-cherkas @pirmink
victoria-cherkas and pirmink authored Mar 15, 2024
1 parent 4109c68 commit a612663
Show file tree
Hide file tree
Showing 27 changed files with 447 additions and 596 deletions.
25 changes: 1 addition & 24 deletions jenkins/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
PATH = "$WORKSPACE/miniconda/bin:$PATH"
}
agent {
label 'tsa'
label 'balfrin'
}

post {
Expand All @@ -28,29 +28,6 @@ pipeline {
'''
}
}
stage('build unpinned') {
steps {
sh '''#!/usr/bin/env bash
set -e
source ${WORKSPACE}/miniconda/etc/profile.d/conda.sh
conda init bash --no-user --install --system
conda activate
bash tools/setup_env.sh -n pyflexplot -u
conda activate pyflexplot
pip install --no-deps .
'''
}
}
stage('test unpinned') {
steps {
sh '''#!/usr/bin/env bash
source $WORKSPACE/miniconda/etc/profile.d/conda.sh
conda init bash --no-user --install --system
conda activate pyflexplot
pytest tests
'''
}
}
stage('build pinned') {
steps {
sh '''#!/usr/bin/env bash
Expand Down
26 changes: 13 additions & 13 deletions tests/slow/test_pyflexplot/test_plots/ref_cosmo-1_affected_area.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@
},
"species": {
"name": "Cs-137",
"half_life": -99.9,
"half_life": 30.0,
"half_life_unit": "a",
"deposition_velocity": 0.0,
"deposition_velocity": 0.0015,
"deposition_velocity_unit": "m s-1",
"sedimentation_velocity": 0.0,
"sedimentation_velocity_unit": "m s-1",
"washout_coefficient": -99.9,
"washout_coefficient": 7e-05,
"washout_coefficient_unit": "s-1",
"washout_exponent": -99.9,
"washout_exponent": 0.8,
},
"variable": {
"unit": "",
Expand Down Expand Up @@ -466,7 +466,7 @@
},
"release_info": {
"title": "Release",
"lines_str": "Site:\tG$\\mathrm{\\\"o}$sgen\nLatitude:\t47$^\\circ$$\\,$21'$\\,$N (47.3659$^\\circ$$\\,$N)\nLongitude:\t7$^\\circ$$\\,$58'$\\,$E (7.9668$^\\circ$$\\,$E)\nHeight:\t100$\\,$$\\,$m AGL\n\n\nStart:\t2019-09-30 12:00 UTC\nEnd:\t2019-09-30 20:00 UTC\nRate:\t34722.2$\\,$Bq s$^{-1}$\nTotal mass:\t1e+09$\\,$Bq\n\n\nSubstance:\tCs-137\nHalf-life:\t-1e+02$\\,$a\nDeposit. vel.:\t0$\\,$m s$^{-1}$\nSediment. vel.:\t0$\\,$m s$^{-1}$\nWashout coeff.:\t-1e+02$\\,$s$^{-1}$\nWashout exponent:\t-1e+02\n",
"lines_str": "Site:\tG$\\mathrm{\\\"o}$sgen\nLatitude:\t47$^\\circ$$\\,$21'$\\,$N (47.3659$^\\circ$$\\,$N)\nLongitude:\t7$^\\circ$$\\,$58'$\\,$E (7.9668$^\\circ$$\\,$E)\nHeight:\t100$\\,$$\\,$m AGL\n\n\nStart:\t2019-09-30 12:00 UTC\nEnd:\t2019-09-30 20:00 UTC\nRate:\t34722.2$\\,$Bq s$^{-1}$\nTotal mass:\t1e+09$\\,$Bq\n\n\nSubstance:\tCs-137\nHalf-life:\t30$\\,$a\nDeposit. vel.:\t0.0015$\\,$m s$^{-1}$\nSediment. vel.:\t0$\\,$m s$^{-1}$\nWashout coeff.:\t7e-05$\\,$s$^{-1}$\nWashout exponent:\t0.8\n",
},
},
"fig_size": [12.5, 8.0],
Expand Down Expand Up @@ -694,15 +694,15 @@
},
"species": {
"name": "Cs-137",
"half_life": -99.9,
"half_life": 30.0,
"half_life_unit": "a",
"deposition_velocity": 0.0,
"deposition_velocity": 0.0015,
"deposition_velocity_unit": "m s-1",
"sedimentation_velocity": 0.0,
"sedimentation_velocity_unit": "m s-1",
"washout_coefficient": -99.9,
"washout_coefficient": 7e-05,
"washout_coefficient_unit": "s-1",
"washout_exponent": -99.9,
"washout_exponent": 0.8,
},
"variable": {
"unit": "",
Expand Down Expand Up @@ -4133,7 +4133,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02$\\,$a",
"s": "30$\\,$a",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4162,7 +4162,7 @@
"va": "top",
"ha": "right",
},
"s": "0$\\,$m s$^{-1}$",
"s": "0.0015$\\,$m s$^{-1}$",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4220,7 +4220,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02$\\,$s$^{-1}$",
"s": "7e-05$\\,$s$^{-1}$",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4249,7 +4249,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02",
"s": "0.8",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down
26 changes: 13 additions & 13 deletions tests/slow/test_pyflexplot/test_plots/ref_cosmo-1_cloud_arrival_time.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@
},
"species": {
"name": "Cs-137",
"half_life": -99.9,
"half_life": 30.0,
"half_life_unit": "a",
"deposition_velocity": 0.0,
"deposition_velocity": 0.0015,
"deposition_velocity_unit": "m s-1",
"sedimentation_velocity": 0.0,
"sedimentation_velocity_unit": "m s-1",
"washout_coefficient": -99.9,
"washout_coefficient": 7e-05,
"washout_coefficient_unit": "s-1",
"washout_exponent": -99.9,
"washout_exponent": 0.8,
},
"variable": {
"unit": "h",
Expand Down Expand Up @@ -474,7 +474,7 @@
},
"release_info": {
"title": "Release",
"lines_str": "Site:\tG$\\mathrm{\\\"o}$sgen\nLatitude:\t47$^\\circ$$\\,$21'$\\,$N (47.3659$^\\circ$$\\,$N)\nLongitude:\t7$^\\circ$$\\,$58'$\\,$E (7.9668$^\\circ$$\\,$E)\nHeight:\t100$\\,$$\\,$m AGL\n\n\nStart:\t2019-09-30 12:00 UTC\nEnd:\t2019-09-30 20:00 UTC\nRate:\t34722.2$\\,$Bq s$^{-1}$\nTotal mass:\t1e+09$\\,$Bq\n\n\nSubstance:\tCs-137\nHalf-life:\t-1e+02$\\,$a\nDeposit. vel.:\t0$\\,$m s$^{-1}$\nSediment. vel.:\t0$\\,$m s$^{-1}$\nWashout coeff.:\t-1e+02$\\,$s$^{-1}$\nWashout exponent:\t-1e+02\n",
"lines_str": "Site:\tG$\\mathrm{\\\"o}$sgen\nLatitude:\t47$^\\circ$$\\,$21'$\\,$N (47.3659$^\\circ$$\\,$N)\nLongitude:\t7$^\\circ$$\\,$58'$\\,$E (7.9668$^\\circ$$\\,$E)\nHeight:\t100$\\,$$\\,$m AGL\n\n\nStart:\t2019-09-30 12:00 UTC\nEnd:\t2019-09-30 20:00 UTC\nRate:\t34722.2$\\,$Bq s$^{-1}$\nTotal mass:\t1e+09$\\,$Bq\n\n\nSubstance:\tCs-137\nHalf-life:\t30$\\,$a\nDeposit. vel.:\t0.0015$\\,$m s$^{-1}$\nSediment. vel.:\t0$\\,$m s$^{-1}$\nWashout coeff.:\t7e-05$\\,$s$^{-1}$\nWashout exponent:\t0.8\n",
},
},
"fig_size": [12.5, 8.0],
Expand Down Expand Up @@ -702,15 +702,15 @@
},
"species": {
"name": "Cs-137",
"half_life": -99.9,
"half_life": 30.0,
"half_life_unit": "a",
"deposition_velocity": 0.0,
"deposition_velocity": 0.0015,
"deposition_velocity_unit": "m s-1",
"sedimentation_velocity": 0.0,
"sedimentation_velocity_unit": "m s-1",
"washout_coefficient": -99.9,
"washout_coefficient": 7e-05,
"washout_coefficient_unit": "s-1",
"washout_exponent": -99.9,
"washout_exponent": 0.8,
},
"variable": {
"unit": "h",
Expand Down Expand Up @@ -4522,7 +4522,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02$\\,$a",
"s": "30$\\,$a",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4551,7 +4551,7 @@
"va": "top",
"ha": "right",
},
"s": "0$\\,$m s$^{-1}$",
"s": "0.0015$\\,$m s$^{-1}$",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4609,7 +4609,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02$\\,$s$^{-1}$",
"s": "7e-05$\\,$s$^{-1}$",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4638,7 +4638,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02",
"s": "0.8",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down
37 changes: 14 additions & 23 deletions tests/slow/test_pyflexplot/test_plots/ref_cosmo-1_concentration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@
},
"species": {
"name": "Cs-137",
"half_life": -99.9,
"half_life": 30.0,
"half_life_unit": "a",
"deposition_velocity": 0.0,
"deposition_velocity": 0.0015,
"deposition_velocity_unit": "m s-1",
"sedimentation_velocity": 0.0,
"sedimentation_velocity_unit": "m s-1",
"washout_coefficient": -99.9,
"washout_coefficient": 7e-05,
"washout_coefficient_unit": "s-1",
"washout_exponent": -99.9,
"washout_exponent": 0.8,
},
"variable": {
"unit": "Bq m-3",
Expand Down Expand Up @@ -391,16 +391,7 @@
"label": None,
"levels": {
"type": "ContourLevelsConfig",
"levels": [
9.999999999999999e-11,
9.999999999999999e-10,
1e-08,
1e-07,
1e-06,
9.999999999999999e-06,
9.999999999999999e-05,
0.001,
],
"levels": [1e-10, 1e-09, 1e-08, 1e-07, 1e-06, 1e-05, 0.0001, 0.001],
"extend": "max",
"include_lower": False,
"legend": {
Expand Down Expand Up @@ -486,7 +477,7 @@
},
"release_info": {
"title": "Freisetzung",
"lines_str": 'Ort:\tG$\\mathrm{\\"o}$sgen\nBreite:\t47$^\\circ$$\\,$21\'$\\,$N (47.3659$^\\circ$$\\,$N)\nL$\\mathrm{\\"a}$nge:\t7$^\\circ$$\\,$58\'$\\,$O (7.9668$^\\circ$$\\,$O)\nH$\\mathrm{\\"o}$he:\t100$\\,$$\\,$m $\\mathrm{\\"u}$.G.\n\n\nStart:\t2019-09-30 12:00 UTC\nEnde:\t2019-09-30 20:00 UTC\nRate:\t34722.2$\\,$Bq s$^{-1}$\nTotale Masse:\t1e+09$\\,$Bq\n\n\nSubstanz:\tCs-137\nHalbwertszeit:\t-1e+02$\\,$a\nDeposit.-Geschw.:\t0$\\,$m s$^{-1}$\nSediment.-Geschw.:\t0$\\,$m s$^{-1}$\nAuswaschkoeff.:\t-1e+02$\\,$s$^{-1}$\nAuswaschexponent:\t-1e+02\n',
"lines_str": 'Ort:\tG$\\mathrm{\\"o}$sgen\nBreite:\t47$^\\circ$$\\,$21\'$\\,$N (47.3659$^\\circ$$\\,$N)\nL$\\mathrm{\\"a}$nge:\t7$^\\circ$$\\,$58\'$\\,$O (7.9668$^\\circ$$\\,$O)\nH$\\mathrm{\\"o}$he:\t100$\\,$$\\,$m $\\mathrm{\\"u}$.G.\n\n\nStart:\t2019-09-30 12:00 UTC\nEnde:\t2019-09-30 20:00 UTC\nRate:\t34722.2$\\,$Bq s$^{-1}$\nTotale Masse:\t1e+09$\\,$Bq\n\n\nSubstanz:\tCs-137\nHalbwertszeit:\t30$\\,$a\nDeposit.-Geschw.:\t0.0015$\\,$m s$^{-1}$\nSediment.-Geschw.:\t0$\\,$m s$^{-1}$\nAuswaschkoeff.:\t7e-05$\\,$s$^{-1}$\nAuswaschexponent:\t0.8\n',
},
},
"fig_size": [12.5, 8.0],
Expand Down Expand Up @@ -714,15 +705,15 @@
},
"species": {
"name": "Cs-137",
"half_life": -99.9,
"half_life": 30.0,
"half_life_unit": "a",
"deposition_velocity": 0.0,
"deposition_velocity": 0.0015,
"deposition_velocity_unit": "m s-1",
"sedimentation_velocity": 0.0,
"sedimentation_velocity_unit": "m s-1",
"washout_coefficient": -99.9,
"washout_coefficient": 7e-05,
"washout_coefficient_unit": "s-1",
"washout_exponent": -99.9,
"washout_exponent": 0.8,
},
"variable": {
"unit": "Bq m-3",
Expand Down Expand Up @@ -4580,7 +4571,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02$\\,$a",
"s": "30$\\,$a",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4609,7 +4600,7 @@
"va": "top",
"ha": "right",
},
"s": "0$\\,$m s$^{-1}$",
"s": "0.0015$\\,$m s$^{-1}$",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4667,7 +4658,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02$\\,$s$^{-1}$",
"s": "7e-05$\\,$s$^{-1}$",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down Expand Up @@ -4696,7 +4687,7 @@
"va": "top",
"ha": "right",
},
"s": "-1e+02",
"s": "0.8",
"replace_edge_spaces": False,
"edge_spaces_replacement_char": "␣",
"kwargs": {
Expand Down
Loading

0 comments on commit a612663

Please sign in to comment.