From e18f280c3d2af9516a0df9ad9bf29dd4a9481a6b Mon Sep 17 00:00:00 2001 From: Andrew Gait Date: Thu, 3 Mar 2022 14:07:26 +0000 Subject: [PATCH 1/2] Add vor_cerebellum to testing --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7e1c74d64c..1c678ef224 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,6 +69,7 @@ pipeline { sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate.git' sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/microcircuit_model.git' sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/SpiNNGym.git' + sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/vor_cerebellum.git' sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/MarkovChainMonteCarlo.git' sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/TestBase.git' sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/SpiNNaker_PDP2.git' @@ -106,6 +107,7 @@ pipeline { sh 'cd sPyNNaker8NewModelTemplate && python ./setup.py develop' sh 'cd SpiNNakerGraphFrontEnd && python ./setup.py develop' sh 'cd SpiNNGym && python ./setup.py develop' + sh 'cd vor_cerebellum && python ./setup.py develop' sh 'cd MarkovChainMonteCarlo && python ./setup.py develop' sh 'cd TestBase && python ./setup.py develop' sh 'cd SpiNNaker_PDP2 && python ./setup.py develop' @@ -121,6 +123,7 @@ pipeline { sh 'pip install -r sPyNNaker/requirements-test.txt' sh 'pip install -r SpiNNakerGraphFrontEnd/requirements-test.txt' sh 'pip install -r SpiNNGym/requirements-test.txt' + sh 'pip install -r vor_cerebellum/requirements-test.txt' sh 'pip install -r MarkovChainMonteCarlo/requirements-test.txt' sh 'pip install -r SpiNNaker_PDP2/requirements-test.txt' // Additional requirements for testing here @@ -179,6 +182,7 @@ pipeline { run_pytest('SpiNNakerGraphFrontEnd/unittests', 1200, 'SpiNNakerGraphFrontEnd', 'unit', 'auto') run_pytest('PyNN8Examples/unittests', 1200, 'PyNN8Examples', 'unit', 'auto') run_pytest('SpiNNGym/unittests', 1200, 'SpiNNGym', 'unit', 'auto') + run_pytest('vor_cerebellum/unittests', 1200, 'vor_cerebellum', 'unit', 'auto') run_pytest('MarkovChainMonteCarlo/unittests', 1200, 'SpiNNaker_PDP2', 'unit', 'auto') run_pytest('SpiNNaker_PDP2/unittests', 1200, 'SpiNNaker_PDP2', 'unit', 'auto') sh "python -m spinn_utilities.executable_finder" @@ -224,6 +228,12 @@ pipeline { run_pytest('SpiNNGym/integration_tests', 3600, 'SpiNNGym_Integration', 'integration', 'auto') } } + stage('Run vor_cerebellum Integration Tests') { + steps { + sh 'python vor_cerebellum/integration_tests/script_builder.py' + run_pytest('vor_cerebellum/integration_tests', 12000, 'vor_cerebellum_Integration', 'integration', 'auto') + } + } stage('Run MarkovChainMonteCarlo Integration Tests') { steps { sh 'python MarkovChainMonteCarlo/mcmc_integration_tests/script_builder.py' From 21b1a45b71e19e42a4fb40284de0e9de4fe3d513 Mon Sep 17 00:00:00 2001 From: Andrew Gait Date: Mon, 26 Sep 2022 11:04:46 +0100 Subject: [PATCH 2/2] Update vor_cerebellum stage --- Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 98cbf7642e..eddcf5223d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -240,8 +240,11 @@ pipeline { } stage('Run vor_cerebellum Integration Tests') { steps { - sh 'python vor_cerebellum/integration_tests/script_builder.py' - run_pytest('vor_cerebellum/integration_tests', 12000, 'vor_cerebellum_Integration', 'integration', 'auto') + catchError(stageResult: 'FAILURE', catchInterruptions: false) { + create_spynnaker_config() + run_in_pyenv('python vor_cerebellum/integration_tests/script_builder.py') + run_pytest('vor_cerebellum/integration_tests', 12000, 'vor_cerebellum_Integration', 'integration', 'auto') + } } } stage('Run MarkovChainMonteCarlo Integration Tests') {