From 2c730a8f30d11ed882a4a446f4e0bf31bf331def Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 26 Oct 2022 10:38:17 +0200 Subject: [PATCH 1/7] add new deploy stage --- .idea/.gitignore | 3 +++ Jenkinsfile | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Jenkinsfile b/Jenkinsfile index 46abb66..371b205 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -124,6 +124,12 @@ pipeline { string(name: 'resume_from', defaultValue: '', description: 'Resume from a previous build identified by the build number.') + + booleanParam(name: 'ContinuousDeployment', + defaultValue: false, + description: 'If true, the gCubeDeployer pipeline is triggered') + + } } //see https://jenkins.io/doc/book/pipeline/syntax/#stages @@ -242,6 +248,19 @@ pipeline { } } } + stage('Deploy components') { + when { + expression { params.ContinuousDeployment == 'true' } + } + steps { + script { + def pjob = build(job: 'gCubeDeployer', wait: true, propagate: true, + parameters: [[$class: 'StringParameterValue', name: 'gCube_release_version', value: "${params.gCube_release_version}"], + [$class: 'StringParameterValue', name: 'TRIGGER_JOB', value: "${JOB_NAME}"]] + ) + } + } + } } From b723dbf88a6024e789db140a48259976e7a2828b Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 26 Oct 2022 10:44:32 +0200 Subject: [PATCH 2/7] fix syntax --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 371b205..31772ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -#!groovy​ +#!groovy import org.yaml.snakeyaml.Yaml // set the build options according to the Type of build @@ -128,8 +128,6 @@ pipeline { booleanParam(name: 'ContinuousDeployment', defaultValue: false, description: 'If true, the gCubeDeployer pipeline is triggered') - - } } //see https://jenkins.io/doc/book/pipeline/syntax/#stages From 6f312acdc46c4ef14534b0120bd16aabe62653cd Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 2 Nov 2022 12:55:40 +0100 Subject: [PATCH 3/7] fix expression syntax --- .idea/misc.xml | 6 ++++++ .idea/vcs.xml | 6 ++++++ .project | 11 +++++++++++ Jenkinsfile | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 .project diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..31602d7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project new file mode 100644 index 0000000..a626b1e --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + gCubeBuilder + + + + + + + + diff --git a/Jenkinsfile b/Jenkinsfile index 31772ec..db0d0eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -248,7 +248,7 @@ pipeline { } stage('Deploy components') { when { - expression { params.ContinuousDeployment == 'true' } + expression { params.ContinuousDeployment.toBoolean() } } steps { script { From 48889c60b02e1ad329b15ae56f1103d222201412 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 9 May 2023 10:09:43 +0200 Subject: [PATCH 4/7] fix param description --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index db0d0eb..789a558 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -127,7 +127,7 @@ pipeline { booleanParam(name: 'ContinuousDeployment', defaultValue: false, - description: 'If true, the gCubeDeployer pipeline is triggered') + description: 'If true, the gCubeDeployer pipeline will be triggered') } //see https://jenkins.io/doc/book/pipeline/syntax/#stages From e91db165a1afc7fc5c38907e90b94e31d84ad371 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 9 May 2023 10:49:13 +0200 Subject: [PATCH 5/7] set to false releaseNotes propagation --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 789a558..f2c5b91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -237,7 +237,7 @@ pipeline { ''' def report_text = sh(script: 'cat ${AGENT_ROOT_FOLDER}/build_commits.csv', returnStdout: true)?.trim() - def pjob = build(job: 'Pipeline-gCubeReleaseNotes', wait: true, propagate: true, + def pjob = build(job: 'Pipeline-gCubeReleaseNotes', wait: true, propagate: false, parameters: [[$class: 'StringParameterValue', name: 'report', value: "${report_text}"], [$class: 'StringParameterValue', name: 'report_number', value: "${env.BUILD_NUMBER}"], [$class: 'StringParameterValue', name: 'gCube_release_version', value: "${params.gCube_release_version}"], From 324dc7f94b3abf490cde9a97c11a3f82d3fa3023 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 11 May 2023 16:06:42 +0200 Subject: [PATCH 6/7] removed ide specific files --- .gitignore | 3 +++ .idea/misc.xml | 6 ------ .idea/vcs.xml | 6 ------ .project | 11 ----------- 4 files changed, 3 insertions(+), 23 deletions(-) create mode 100644 .gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .project diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..69d7f4d --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.project +.idea + diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 31602d7..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index a626b1e..0000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - gCubeBuilder - - - - - - - - From 96d90b8748303da592d294bc609553600f332edd Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 11 May 2023 16:08:26 +0200 Subject: [PATCH 7/7] removed another ide specific file --- .idea/.gitignore | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml