Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spalloc Server integration testing #76

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Spalloc Server integration testing #76

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
20c5ea4
jenkins trigger
dkfellows Sep 22, 2021
14110a2
Change to use spalloc: URLs
dkfellows Nov 1, 2021
335ca56
Switch to the new server in compat mode
dkfellows Nov 1, 2021
718490d
Try to avoid using internal IP address for spalloc
dkfellows Nov 2, 2021
718e72d
Merge branch 'main' into spalloc-server
dkfellows Aug 4, 2022
004ded5
Merge branch 'spalloc-server' of
rowleya Dec 1, 2022
9d6d6cc
Try jenkins direct
rowleya Dec 2, 2022
0d8e731
Get the URL right!
rowleya Dec 2, 2022
0f6c2be
Fix missing folder
rowleya Dec 5, 2022
c8e9a74
Test one-by-one
rowleya Jan 25, 2023
3b9928d
Missing space
rowleya Jan 25, 2023
8f43237
Try a different capture method
rowleya Jan 25, 2023
3d29fd7
A different way to get output...
rowleya Jan 25, 2023
8008b2b
Revert to default
rowleya Jan 26, 2023
113a2c4
Add setproctitle so we know what test is running where
rowleya Jan 27, 2023
10afa9e
Fix install
rowleya Jan 27, 2023
2d2ceb2
Revert back for main tests
rowleya Feb 10, 2023
3259716
Try without proxy mode
rowleya Feb 10, 2023
141cf1b
Try with proxy now
rowleya Feb 10, 2023
1665b52
Merge branch 'main' into spalloc-server-jdbc
rowleya Feb 20, 2023
43ab1be
Check normal master again
rowleya Feb 24, 2023
7225665
Merge branch 'spalloc-server-jdbc' of
rowleya Feb 24, 2023
02b7cec
With proxy and new spalloc
rowleya Feb 28, 2023
85b28c2
Merge branch 'main' into spalloc-server-jdbc
rowleya Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pipeline {
run_in_pyenv('python -m spynnaker.pyNN.setup_pynn')
// Additional requirements for testing here
// coverage version capped due to https://github.com/nedbat/coveragepy/issues/883
run_in_pyenv('pip install python-coveralls "coverage>=5.0.0" pytest-instafail pytest-xdist pytest-progress pytest-forked pytest-timeout')
run_in_pyenv('pip install python-coveralls "coverage>=5.0.0" pytest-instafail pytest-xdist pytest-progress pytest-forked pytest-timeout setproctitle')
run_in_pyenv('pip freeze')
// Java install, not server
sh 'mvn package -B -f JavaSpiNNaker -pl -SpiNNaker-allocserv'
Expand Down Expand Up @@ -336,6 +336,7 @@ pipeline {
}

def run_pytest(String tests, int timeout, String results, String covfile, String threads) {
sh 'mkdir -p junit'
def resfile = 'junit/' + results + '.xml'
covfile += '_cov.xml'
sh 'echo "<testsuite tests="0"></testsuite>" > ' + resfile
Expand All @@ -354,8 +355,8 @@ def create_spynnaker_config() {
if [[ ! -f ~/.spynnaker.cfg ]]
then
echo "[Machine]" > ~/.spynnaker.cfg
echo "spalloc_server = 10.11.192.11" >> ~/.spynnaker.cfg
echo "spalloc_user = Jenkins" >> ~/.spynnaker.cfg
echo "spalloc_server = https://jenkins:[email protected]/spalloc/" >> ~/.spynnaker.cfg
echo "spalloc_use_proxy = True" >> ~/.spynnaker.cfg
echo "enable_advanced_monitor_support = True" >> ~/.spynnaker.cfg
echo "[Java]" >> ~/.spynnaker.cfg
echo "use_java = True" >> ~/.spynnaker.cfg
Expand All @@ -373,8 +374,8 @@ def create_gfe_config() {
if [[ ! -f ~/.spiNNakerGraphFrontEnd.cfg ]]
then
echo "[Machine]" > ~/.spiNNakerGraphFrontEnd.cfg
echo "spalloc_server = 10.11.192.11" >> ~/.spiNNakerGraphFrontEnd.cfg
echo "spalloc_user = Jenkins" >> ~/.spiNNakerGraphFrontEnd.cfg
echo "spalloc_server = https://jenkins:[email protected]/spalloc/" >> ~/.spiNNakerGraphFrontEnd.cfg
echo "spalloc_use_proxy = True" >> ~/.spiNNakerGraphFrontEnd.cfg
echo "enable_advanced_monitor_support = True" >> ~/.spiNNakerGraphFrontEnd.cfg
echo "[Java]" >> ~/.spiNNakerGraphFrontEnd.cfg
echo "use_java = True" >> ~/.spiNNakerGraphFrontEnd.cfg
Expand Down