From 35c89ed1763747ba8984e064aebf52bde79ad47f Mon Sep 17 00:00:00 2001 From: Lorenzo Delgado Date: Thu, 1 Dec 2022 11:28:09 +0100 Subject: [PATCH] ci(jenkins): support experimental flag in the pr and release pipelines --- Dockerfile | 2 +- ci/Jenkinsfile.prs | 11 ++++++++--- ci/Jenkinsfile.release | 8 +++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5699ba40c..e46322451 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM alpine:edge AS nim-build ARG NIMFLAGS ARG MAKE_TARGET=wakunode2 -ARG EXPERIMENTAL=true +ARG EXPERIMENTAL=false # Get build tools and required header files RUN apk add --no-cache bash git cargo build-base pcre-dev linux-headers diff --git a/ci/Jenkinsfile.prs b/ci/Jenkinsfile.prs index 041a5b540..0c4b86747 100644 --- a/ci/Jenkinsfile.prs +++ b/ci/Jenkinsfile.prs @@ -29,6 +29,11 @@ pipeline { description: 'Makefile flags.', defaultValue: params.MAKEFLAGS ?: '-j6' ) + booleanParam( + name: 'EXPERIMENTAL', + description: 'Enable experimental features.', + defaultValue: false + ) } options { @@ -59,7 +64,7 @@ pipeline { stage('Binaries') { parallel { - stage('V1') { + stage('V1') { when { expression { v1changed } } steps { script { nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} v1") @@ -68,7 +73,7 @@ pipeline { stage('V2') { when { expression { v2changed } } steps { script { - nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} v2") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} EXPERIMENTAL=${params.EXPERIMENTAL} v2") } } } } @@ -85,7 +90,7 @@ pipeline { stage('V2') { when { expression { v2changed } } steps { script { - nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} test2") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} EXPERIMENTAL=${params.EXPERIMENTAL} test2") } } } } diff --git a/ci/Jenkinsfile.release b/ci/Jenkinsfile.release index 654eca478..e24ce1c8c 100644 --- a/ci/Jenkinsfile.release +++ b/ci/Jenkinsfile.release @@ -36,6 +36,11 @@ pipeline { '-d:insecure', ].join(' ') ) + booleanParam( + name: 'EXPERIMENTAL', + description: 'Enable experimental features.', + defaultValue: false + ) } stages { @@ -45,7 +50,8 @@ pipeline { "${params.IMAGE_NAME}:${env.GIT_COMMIT.take(8)}", "--label=commit='${env.GIT_COMMIT.take(8)}' " + "--build-arg=MAKE_TARGET='${params.MAKE_TARGET}' " + - "--build-arg=NIMFLAGS='${params.NIMFLAGS}' ." + "--build-arg=NIMFLAGS='${params.NIMFLAGS}' " + + "--build-arg=EXPERIMENTAL='${params.EXPERIMENTAL}' ." ) } } }