From e16c9349039597f606046c8c66ceb4f4c8195095 Mon Sep 17 00:00:00 2001 From: Nick Miles Date: Mon, 14 Oct 2024 10:30:10 +0100 Subject: [PATCH] DSF-106 Added performance two (#127) * DSF-106 Added performance two * DSF-106 Added output of docker networks --- build/automation/lib/docker.mk | 1 + build/jenkins/Jenkinsfile.stages | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/automation/lib/docker.mk b/build/automation/lib/docker.mk index a0942c31..0206ae52 100644 --- a/build/automation/lib/docker.mk +++ b/build/automation/lib/docker.mk @@ -66,6 +66,7 @@ docker-create-from-template: ### Create Docker image from template - mandatory: docker-config: ### Configure Docker networking docker network create $(DOCKER_NETWORK) 2> /dev/null ||: + docker network ls docker-build docker-image: ### Build Docker image - mandatory: NAME; optional: VERSION,FROM_CACHE=false,BUILD_OPTS=[build options],EXAMPLE=false reg=$$(make _docker-get-reg) diff --git a/build/jenkins/Jenkinsfile.stages b/build/jenkins/Jenkinsfile.stages index f29fc61f..ab8fc560 100644 --- a/build/jenkins/Jenkinsfile.stages +++ b/build/jenkins/Jenkinsfile.stages @@ -1,8 +1,8 @@ pipeline { agent any parameters { - choice(name: 'ENVIRONMENT', choices: ['test', 'test1', 'test2', 'test3', 'test4', 'fix', 'performance', 'regression'], description: 'Environment of the Stage to deploy') - string(name: 'LAMBDA_VERSION', defaultValue: '1', description: 'Lambda Version to Stage in API Gateway') + choice(name: 'ENVIRONMENT', choices: ['test', 'test1', 'test2', 'test3', 'test4', 'fix', 'performance', 'performance2', 'regression'], description: 'Environment of the Stage to deploy') + string(name: 'LAMBDA_VERSION', defaultValue: '1', description: 'Version or alias of the RD Lambda for stage to point at') } options { buildDiscarder(logRotator(daysToKeepStr: "7", numToKeepStr: "13"))