From 43eb63e27196edcffbe90651ddbbfb456bc05682 Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Fri, 23 Aug 2019 15:56:34 +0100 Subject: [PATCH 1/5] Test Jenkins release on a pull request --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4674112..49ae853b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,13 +92,13 @@ pipeline { } stages { stage('Release') { - when { + /*when { expression { isReleaseBranchOfOrganisation('xmos') } - } + }*/ steps { - sh 'mkdir ${REPO}/empty' + sh "mkdir ${REPO}/empty" xcoreReleaseToGithub("${WORKSPACE}/${REPO}","${WORKSPACE}/${REPO}/empty") } } From a135b674f7cac56b6bc7765121f41649f248b0ba Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Fri, 23 Aug 2019 16:36:14 +0100 Subject: [PATCH 2/5] Troubleshoot Jenkins release --- Jenkinsfile | 3 +++ tests/test_i2s_loopback.py | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 49ae853b..e4c5f0f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,6 +90,9 @@ pipeline { agent { label 'x86_64&&brew' } + steps { + xcorePrepareSandbox("${VIEW}", "${REPO}") + } stages { stage('Release') { /*when { diff --git a/tests/test_i2s_loopback.py b/tests/test_i2s_loopback.py index 9e50793b..411f56b4 100644 --- a/tests/test_i2s_loopback.py +++ b/tests/test_i2s_loopback.py @@ -31,20 +31,20 @@ def runtest_one_config(env, format, i2s_role, num_chans_in, num_chans_out, sampl xmostest.run_on_simulator(resources['xsim'], binary, tester=tester, simargs=['--max-cycles', str(max_cycles), '--plugin', 'LoopbackPort.dll', loopback_args]) def runtest(): - runtest_one_config('simulation', 'i2s', 'master', 2, 2, '48khz') - runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '48khz') + #runtest_one_config('simulation', 'i2s', 'master', 2, 2, '48khz') + #runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '48khz') - runtest_one_config('simulation', 'i2s', 'master', 2, 2, '192khz') - runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '192khz') + #runtest_one_config('simulation', 'i2s', 'master', 2, 2, '192khz') + #runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '192khz') - runtest_one_config('simulation', 'i2s', 'master', 8, 8, '48khz') - runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '48khz') + #runtest_one_config('simulation', 'i2s', 'master', 8, 8, '48khz') + #runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '48khz') - runtest_one_config('simulation', 'i2s', 'master', 8, 8, '192khz') - runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '192khz') + #runtest_one_config('simulation', 'i2s', 'master', 8, 8, '192khz') + #runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '192khz') - runtest_one_config('simulation', 'tdm', 'master', 8, 8, '48khz') - runtest_one_config('simulation', 'tdm', 'slave', 8, 8, '48khz') + #runtest_one_config('simulation', 'tdm', 'master', 8, 8, '48khz') + #runtest_one_config('simulation', 'tdm', 'slave', 8, 8, '48khz') - runtest_one_config('simulation', 'tdm', 'master', 16, 16, '48khz') - runtest_one_config('simulation', 'tdm', 'slave', 16, 16, '48khz') + #runtest_one_config('simulation', 'tdm', 'master', 16, 16, '48khz') + #runtest_one_config('simulation', 'tdm', 'slave', 16, 16, '48khz') From 58713733a27a5fc4e9bda3f70dac1060328cdfad Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Fri, 23 Aug 2019 16:38:53 +0100 Subject: [PATCH 3/5] Troubleshoot Jenkins release --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4c5f0f1..ef963c5a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,10 +90,12 @@ pipeline { agent { label 'x86_64&&brew' } - steps { - xcorePrepareSandbox("${VIEW}", "${REPO}") - } stages { + stage('Get view') { + steps { + xcorePrepareSandbox("${VIEW}", "${REPO}") + } + } stage('Release') { /*when { expression { From dcfe0235ad3d333c08f5a06ea72c465867127a93 Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Fri, 23 Aug 2019 17:04:31 +0100 Subject: [PATCH 4/5] Unstuck test script --- tests/test_i2s_loopback.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_i2s_loopback.py b/tests/test_i2s_loopback.py index 411f56b4..e304e580 100644 --- a/tests/test_i2s_loopback.py +++ b/tests/test_i2s_loopback.py @@ -31,8 +31,8 @@ def runtest_one_config(env, format, i2s_role, num_chans_in, num_chans_out, sampl xmostest.run_on_simulator(resources['xsim'], binary, tester=tester, simargs=['--max-cycles', str(max_cycles), '--plugin', 'LoopbackPort.dll', loopback_args]) def runtest(): - #runtest_one_config('simulation', 'i2s', 'master', 2, 2, '48khz') - #runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '48khz') + runtest_one_config('simulation', 'i2s', 'master', 2, 2, '48khz') + runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '48khz') #runtest_one_config('simulation', 'i2s', 'master', 2, 2, '192khz') #runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '192khz') From 0eaefc3478497a86edeff205c78d2d0fc1221dbc Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Fri, 23 Aug 2019 17:17:21 +0100 Subject: [PATCH 5/5] Jenkins release ready for merging --- Jenkinsfile | 4 ++-- tests/test_i2s_loopback.py | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ef963c5a..5cd2bc3b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,11 +97,11 @@ pipeline { } } stage('Release') { - /*when { + when { expression { isReleaseBranchOfOrganisation('xmos') } - }*/ + } steps { sh "mkdir ${REPO}/empty" xcoreReleaseToGithub("${WORKSPACE}/${REPO}","${WORKSPACE}/${REPO}/empty") diff --git a/tests/test_i2s_loopback.py b/tests/test_i2s_loopback.py index e304e580..9e50793b 100644 --- a/tests/test_i2s_loopback.py +++ b/tests/test_i2s_loopback.py @@ -34,17 +34,17 @@ def runtest(): runtest_one_config('simulation', 'i2s', 'master', 2, 2, '48khz') runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '48khz') - #runtest_one_config('simulation', 'i2s', 'master', 2, 2, '192khz') - #runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '192khz') + runtest_one_config('simulation', 'i2s', 'master', 2, 2, '192khz') + runtest_one_config('simulation', 'i2s', 'slave', 2, 2, '192khz') - #runtest_one_config('simulation', 'i2s', 'master', 8, 8, '48khz') - #runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '48khz') + runtest_one_config('simulation', 'i2s', 'master', 8, 8, '48khz') + runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '48khz') - #runtest_one_config('simulation', 'i2s', 'master', 8, 8, '192khz') - #runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '192khz') + runtest_one_config('simulation', 'i2s', 'master', 8, 8, '192khz') + runtest_one_config('simulation', 'i2s', 'slave', 8, 8, '192khz') - #runtest_one_config('simulation', 'tdm', 'master', 8, 8, '48khz') - #runtest_one_config('simulation', 'tdm', 'slave', 8, 8, '48khz') + runtest_one_config('simulation', 'tdm', 'master', 8, 8, '48khz') + runtest_one_config('simulation', 'tdm', 'slave', 8, 8, '48khz') - #runtest_one_config('simulation', 'tdm', 'master', 16, 16, '48khz') - #runtest_one_config('simulation', 'tdm', 'slave', 16, 16, '48khz') + runtest_one_config('simulation', 'tdm', 'master', 16, 16, '48khz') + runtest_one_config('simulation', 'tdm', 'slave', 16, 16, '48khz')