From 6f85a6118380b3f24d8bf29555b18b78be2c255c Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 31 Mar 2022 14:59:36 +0100 Subject: [PATCH 1/7] Jenkins Trgger --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6316a81..569363c 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ # IntegrationTests Integration Tests unified over all repositories + In particular, tests: * [sPyNNaker](https://github.com/SpiNNakerManchester/sPyNNaker) * [SpiNNaker Graph Front End](https://github.com/SpiNNakerManchester/SpiNNakerGraphFrontEnd) From 8d3c653e3153aa0178c42c4b5e1d9994d4e89e03 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 1 Apr 2022 16:18:10 +0100 Subject: [PATCH 2/7] Jenkins trigger --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6316a81..5d6dc84 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![Jenkins tests](https://img.shields.io/jenkins/tests?compact_message&jobUrl=http%3A%2F%2Fapollo.cs.man.ac.uk%3A8080%2Fjob%2FIntegration%2520Tests%2Fjob%2Fmain%2F&label=integration%20tests)](http://apollo.cs.man.ac.uk:8080/blue/organizations/jenkins/Integration%20Tests/activity/) + # IntegrationTests Integration Tests unified over all repositories From 31112a4df6593c9a0fcd1a32d00b3b9c83dfead9 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Mon, 11 Apr 2022 10:49:25 +0100 Subject: [PATCH 3/7] run setup_pynn --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7e1c74d..041e478 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -119,6 +119,7 @@ pipeline { sh 'pip install -r spalloc/requirements-test.txt' sh 'pip install -r SpiNNFrontEndCommon/requirements-test.txt' sh 'pip install -r sPyNNaker/requirements-test.txt' + sh 'python -m spynnaker.pyNN.setup_pynn' sh 'pip install -r SpiNNakerGraphFrontEnd/requirements-test.txt' sh 'pip install -r SpiNNGym/requirements-test.txt' sh 'pip install -r MarkovChainMonteCarlo/requirements-test.txt' From c6a34c1c6e401ad786d184d7e7eb12caeaaf935f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 20 Apr 2022 07:20:16 +0100 Subject: [PATCH 4/7] disable GFE as broken --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 041e478..7ea667c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -190,12 +190,14 @@ pipeline { run_pytest('sPyNNaker/spynnaker_integration_tests/', 24000, 'sPyNNaker_Integration_Tests', 'integration', 'auto') } } + /* stage('Run GFE Integeration Tests') { steps { sh 'python SpiNNakerGraphFrontEnd/gfe_integration_tests/script_builder.py' run_pytest('SpiNNakerGraphFrontEnd/gfe_integration_tests/', 3600, 'GFE_Integration', 'integration', 'auto') } } + */ stage('Run IntroLab Integration Tests') { steps { sh 'python IntroLab/integration_tests/script_builder.py' From 1fa8c74d5091db69d33ad31cbf15fd581090dc1e Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 20 Apr 2022 09:04:06 +0100 Subject: [PATCH 5/7] correct setup pynn --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7ea667c..e126486 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,7 @@ pipeline { sh 'cd TestBase && python ./setup.py develop' sh 'cd SpiNNaker_PDP2 && python ./setup.py develop' sh 'cd Visualiser && python ./setup.py develop' - sh 'python -m spynnaker8.setup_pynn' + sh 'python -m spynnaker.pyyn.setup_pynn' // Test requirements sh 'pip install -r SpiNNMachine/requirements-test.txt' sh 'pip install -r SpiNNMan/requirements-test.txt' From 3bb9d5598e8645e6bfa9480a71eab93895c71517 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 20 Apr 2022 09:07:19 +0100 Subject: [PATCH 6/7] GFE tests back on --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e126486..1ad8322 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -190,14 +190,12 @@ pipeline { run_pytest('sPyNNaker/spynnaker_integration_tests/', 24000, 'sPyNNaker_Integration_Tests', 'integration', 'auto') } } - /* stage('Run GFE Integeration Tests') { steps { sh 'python SpiNNakerGraphFrontEnd/gfe_integration_tests/script_builder.py' run_pytest('SpiNNakerGraphFrontEnd/gfe_integration_tests/', 3600, 'GFE_Integration', 'integration', 'auto') } } - */ stage('Run IntroLab Integration Tests') { steps { sh 'python IntroLab/integration_tests/script_builder.py' From 42d6c7bc3a730992c8e4e30d71d9f2832bd3615f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 20 Apr 2022 09:29:28 +0100 Subject: [PATCH 7/7] spynnaker.pyNN.setup_pynn --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1ad8322..ebf60e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,7 @@ pipeline { sh 'cd TestBase && python ./setup.py develop' sh 'cd SpiNNaker_PDP2 && python ./setup.py develop' sh 'cd Visualiser && python ./setup.py develop' - sh 'python -m spynnaker.pyyn.setup_pynn' + sh 'python -m spynnaker.pyNN.setup_pynn' // Test requirements sh 'pip install -r SpiNNMachine/requirements-test.txt' sh 'pip install -r SpiNNMan/requirements-test.txt' @@ -119,7 +119,6 @@ pipeline { sh 'pip install -r spalloc/requirements-test.txt' sh 'pip install -r SpiNNFrontEndCommon/requirements-test.txt' sh 'pip install -r sPyNNaker/requirements-test.txt' - sh 'python -m spynnaker.pyNN.setup_pynn' sh 'pip install -r SpiNNakerGraphFrontEnd/requirements-test.txt' sh 'pip install -r SpiNNGym/requirements-test.txt' sh 'pip install -r MarkovChainMonteCarlo/requirements-test.txt'