commit e7b1033737084df9aaa8e30625397d6fdc71a04d
author Leontii Istomin <listomin@mirantis.com> Tue Feb 20 17:01:58 2018 +0100
committer Leontii Istomin <listomin@mirantis.com> Wed Feb 21 12:29:27 2018 +0100
tree e6e5b1e1e3fd7e52dff8d84ac1f42ee4b1936fa8
parent 829abf26a27fa27c7f47dac8c3440f93b2ee9581

Add ability to specify refspec for reclass-system

 - Get sharedReclassUrl from default_context instead pass it via job params
 - Add ability to specify sharedReclassRefspec via default_context
   For example: "refs/changes/21/15921/4"
 - Use refspec instead of tag/branch if specified

Change-Id: I694a9cee40e05f88f6a95747ecb315286336a8cf

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index a4b646e..9e48ec8 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -7,7 +7,6 @@
  *   COOKIECUTTER_TEMPLATE_BRANCH       Branch for the template.
  *   COOKIECUTTER_TEMPLATE_CONTEXT      Context parameters for the template generation.
  *   EMAIL_ADDRESS                      Email to send a created tar file
- *   SHARED_RECLASS_URL                 Git repository with shared reclass
  *
 **/
 
@@ -62,12 +61,18 @@
                     sh "rm -rfv .git"
                     sh "git init"
 
-                    if (SHARED_RECLASS_URL != '') {
-                        ssh.agentSh "git submodule add \"${SHARED_RECLASS_URL}\" \"classes/system\""
+                    def sharedReclassUrl = templateContext['default_context']['shared_reclass_url']
+                    if (sharedReclassUrl != '') {
+                        ssh.agentSh "git submodule add \"${sharedReclassUtl}\" \"classes/system\""
 
-                        def mcpVersion = templateContext['default_context']['mcp_version']
-                        if(mcpVersion != "stable" && mcpVersion != "nightly" && mcpVersion != "testing"){
-                            ssh.agentSh "cd \"classes/system\";git fetch --tags;git checkout ${mcpVersion}"
+                        def sharedReclassRefspec = templateContext['default_context']['shared_reclass_refspec']
+                        if(sharedReclassRefspec != '') {
+                            ssh.agentSh "cd \"classes/system\";git fetch ${sharedReclassUrl} ${sharedReclassRefspec}; git checkout FETCH_HEAD"
+                        } else {
+                            def mcpVersion = templateContext['default_context']['mcp_version']
+                            if(mcpVersion != "stable" && mcpVersion != "nightly" && mcpVersion != "testing"){
+                                ssh.agentSh "cd \"classes/system\";git fetch --tags;git checkout ${mcpVersion}"
+                            }
                         }
 
                         git.commitGitChanges(modelEnv, "Added new shared reclass submodule", "${user}@localhost", "${user}")