From 802b29f77a954d2c66a557cbc681d762c4d9567c Mon Sep 17 00:00:00 2001 From: jamesread Date: Mon, 18 Oct 2021 12:17:07 +0100 Subject: [PATCH] config filename --- Jenkinsfile | 2 ++ integration-tests/cypressRun.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 64efaf1..ec2fc65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,8 @@ pipeline { stages { stage ('Pre-Build') { steps { + cleanWs() + sh 'make go-tools' } } diff --git a/integration-tests/cypressRun.sh b/integration-tests/cypressRun.sh index 6c07b60..c5018d5 100755 --- a/integration-tests/cypressRun.sh +++ b/integration-tests/cypressRun.sh @@ -4,7 +4,7 @@ set -o xtrace echo "Running config $1" -cp -f ../configs/config.{$1}.yaml ./config/config.yaml +cp -f ../configs/config.$1.yaml ./config/config.yaml docker start olivetin NO_COLOR=1 ./node_modules/.bin/cypress run --headless -s cypress/integration/$1/* || true docker kill olivetin