From 7e806b7b3d3b726b87497bb260f43e5f98c4097c Mon Sep 17 00:00:00 2001 From: hindilla-eaton <114917405+hindilla-eaton@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:41:13 +0200 Subject: [PATCH 1/3] Update Jenkinsfile --- Jenkinsfile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 753270eb39..9348323f98 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,12 @@ +#!/usr/bin/env groovy + @Library('etn-ipm2-jenkins') _ +//We want to manage push to obs from global parameters +import params.CmakePipelineParams +CmakePipelineParams parameters = new CmakePipelineParams() + +parameters.enableDebugBuild = false pipeline { agent { docker { @@ -532,7 +539,21 @@ OUT="`git status -s`" && [ -z "\$OUT" ] \\ } } // Commit Coverity - stage ('deploy') { + stage ('Push to OBS') { + when { + allOf { + expression { return parameters.enableDeploy } + anyOf { + branch 'master' + branch 'main' + branch "release/*" + branch "featureimage/*" + branch 'FTY' + branch '*-FTY-master' + branch '*-FTY' + } + } + } steps { script { deploy.pushToOBS() From ffa03527fb18fbc293b1864081e0ac6112869f30 Mon Sep 17 00:00:00 2001 From: hindilla-eaton <114917405+hindilla-eaton@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:34:56 +0200 Subject: [PATCH 2/3] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9348323f98..cc289c4bc9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ //We want to manage push to obs from global parameters import params.CmakePipelineParams -CmakePipelineParams parameters = new CmakePipelineParams() +CmakePipelineParams cmakeParameters = new CmakePipelineParams() parameters.enableDebugBuild = false pipeline { @@ -542,7 +542,7 @@ OUT="`git status -s`" && [ -z "\$OUT" ] \\ stage ('Push to OBS') { when { allOf { - expression { return parameters.enableDeploy } + expression { return cmakeParameters.enableDeploy } anyOf { branch 'master' branch 'main' From 1504e19bf20366a31436274a4dbb09b735463f74 Mon Sep 17 00:00:00 2001 From: hindilla-eaton <114917405+hindilla-eaton@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:17:22 +0200 Subject: [PATCH 3/3] Update Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc289c4bc9..3e958d7a07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,6 @@ import params.CmakePipelineParams CmakePipelineParams cmakeParameters = new CmakePipelineParams() -parameters.enableDebugBuild = false pipeline { agent { docker {