From a1df8cd043d45f3c9a9b8e11bedc3fc322c69555 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 May 2022 15:40:04 +0100 Subject: [PATCH 1/6] Add a Jenkinsfile for running the tests --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..342976e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent { "ultron" } + stages { + stage('store') { + steps { + sh 'set -e; if [ ! -r testing/.stored ]; then cd testing; ./store-ref-data.sh; touch .stored; fi' + } + } + stage('test') { + steps { + sh 'set -e; cd testing; ./run-tests.sh' + } + } + } +} From d85da7c894037ffb4d637a480d27d3ae7d2c6d63 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 May 2022 15:45:20 +0100 Subject: [PATCH 2/6] Jenkinsfile: Change agent to any --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 342976e..eff0a74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { "ultron" } + agent { any } stages { stage('store') { steps { From f8b0798cbe799929490182052f12b3aa34fa0d2a Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 May 2022 15:48:09 +0100 Subject: [PATCH 3/6] Jenkinsfile: Fix syntax for agent --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index eff0a74..2c41459 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { any } + agent any stages { stage('store') { steps { From c61eac6808cf5881dc69aea34eb8fbf2f70ec6e3 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 May 2022 15:51:24 +0100 Subject: [PATCH 4/6] Jenkinsfile: Change to using linux label --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c41459..f9021b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent any + agent { node { label 'linux' } } stages { stage('store') { steps { From 63bf337617e917e4903a7ed70cd2c5a5fdbce470 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 May 2022 15:57:55 +0100 Subject: [PATCH 5/6] Jenkinsfile: Add TERM=dumb for tput in run-tests.sh --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f9021b7..4225f5b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } stage('test') { steps { - sh 'set -e; cd testing; ./run-tests.sh' + sh 'set -e; cd testing; TERM=dumb ./run-tests.sh' } } } From 5ddb9cdc75a1694eecdb9b192e7fce1bc6002c06 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 6 May 2022 16:19:27 +0100 Subject: [PATCH 6/6] run-tests.sh: Only use colours if running in a terminal --- testing/run-tests.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/testing/run-tests.sh b/testing/run-tests.sh index aa631aa..f5579d6 100755 --- a/testing/run-tests.sh +++ b/testing/run-tests.sh @@ -79,9 +79,15 @@ done printf "\n\n\nChecking against reference data...\n\n" # Set colors -normal=$(tput sgr0) -red=$(tput setaf 1) -green=$(tput setaf 2) +if [ -t 1 ]; then + normal=$(tput sgr0) + red=$(tput setaf 1) + green=$(tput setaf 2) +else + normal="" + red="" + green="" +fi # Number of fails nFails=0