commit 0f0c705ca902742852b909336463a953705beef4
author Tomáš Kukrál <tkukral@mirantis.com> Fri Mar 24 16:11:21 2017 +0100
committer Tomáš Kukrál <tkukral@mirantis.com> Mon Mar 27 21:29:21 2017 +0200
tree 8a20216ab68ac8ed1522db31f807cc7731d64fb3
parent a5b5eaed1d36e12e76ded962664fb73f84bf5aab

clean salt-models/generate class

Change-Id: Ic906bf33a2775da9465fa3bcfadb1a4622102453

jenkins/client/job/salt-models/generate.yml

diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index dc539e8..60cfb14 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -10,25 +10,25 @@
           template:
             type: workflow-scm
             concurrent: true
-            display_name: "[MCP] Generate reclass cluster {{cookiecutter_template}}"
+            display_name: "Generate reclass cluster {{cookiecutter_template}}"
             scm:
               type: git
-              url: ${_param:jenkins_job_repository}
-              credentials: "gitlab"
-              script: metadata/cookiecutter_generate.groovy
+              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+              credentials: "jenkins-mk"
+              script: generate-cookiecutter-products.groovy
             param:
               COOKIECUTTER_TEMPLATE_URL:
                 type: string
                 default: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model.git"
               COOKIECUTTER_TEMPLATE_CREDENTIALS:
                 type: string
-                default: jenkins
+                default: github-credentials
               COOKIECUTTER_TEMPLATE_BRANCH:
                 type: string
                 default: master
-#              COOKIECUTTER_TEMPLATE_PATH:
-#                type: string
-#                default: 'cluster/{{cookiecutter_template}}'
+              COOKIECUTTER_TEMPLATE_PATH:
+                type: string
+                default: "./"
               COOKIECUTTER_INSTALL_CICD:
                 type: boolean
                 default: false
@@ -48,11 +48,10 @@
                 type: string
               RECLASS_MODEL_URL:
                 type: string
-                default: "
-                ssh://jenkins@gerrit.mcp.mirantis.net:29418/salt-models/training"
+                default: "jenkins-mk@${_param:jenkins_gerrit_url}/salt-models/training.git"
               RECLASS_MODEL_CREDENTIALS:
                 type: string
-                default: jenkins_slave
+                default: gerrit
               RECLASS_MODEL_BRANCH:
                 type: string
                 default: master