commit 6c5957eb871c7c621f02c539693e4a02624403cd
author Tomáš Kukrál <tomkukral@users.noreply.github.com> Thu Mar 30 18:04:38 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Thu Mar 30 16:05:45 2017 +0000
tree 57d322b13b5a6a13334b1a8aedca737a2d102cc1
parent e95259115a17ced92f932d6251e7325e4a8e831a

add option to disable commit

Change-Id: Ib06e9855671bb8a10b764b3ff06ff8d50e47418c

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index b97af99..dbefa05 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -119,19 +119,19 @@
                 writeFile(file: nodeFile, text: nodeString)
             }
 
-            if (COMMIT_CHANGES.toBoolean()) {
-                stage('Inject changes to Reclass model') {
-                    git.changeGitBranch(modelEnv, targetBranch)
-                    def outputSource = "${templateOutputDir}/${clusterName}"
-                    def outputDestination = "${modelEnv}/classes/cluster/${clusterName}"
-                    sh(returnStdout: true, script: "cp ${outputSource} ${outputDestination} -r")
-                    git.commitGitChanges(modelEnv, "Added new cluster ${clusterName}")
-                    archiveArtifacts artifacts: modelEnv
-                }
+            stage('Inject changes to Reclass model') {
+                git.changeGitBranch(modelEnv, targetBranch)
+                def outputSource = "${templateOutputDir}/${clusterName}"
+                def outputDestination = "${modelEnv}/classes/cluster/${clusterName}"
+                sh(returnStdout: true, script: "cp ${outputSource} ${outputDestination} -r")
+            }
 
-                stage ('Push changes to Reclass model') {
+            stage ('Save changes to Reclass model') {
+                if (COMMIT_CHANGES.toBoolean()) {
+                    git.commitGitChanges(modelEnv, "Added new cluster ${clusterName}")
                     git.pushGitChanges(modelEnv, targetBranch, 'origin', RECLASS_MODEL_CREDENTIALS)
                 }
+                archiveArtifacts artifacts: modelEnv
             }
 
         } catch (Throwable e) {