update params for cookiecutter generator
+ remove generate-auto - it isn't used anymore
Change-Id: I1fc2c894f4375e4cfd9aebf360cd4dfe22948e7d
diff --git a/jenkins/client/job/salt-models/generate-auto.yml b/jenkins/client/job/salt-models/generate-auto.yml
deleted file mode 100644
index 79e4ba3..0000000
--- a/jenkins/client/job/salt-models/generate-auto.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-parameters:
- jenkins:
- client:
- job_template:
- generate-salt-model-auto:
- name: generate-salt-model-{{cookiecutter_template}}
- param:
- cookiecutter_template:
- - separated-products-auto
- template:
- type: workflow-scm
- concurrent: true
- display_name: "Generate reclass cluster {{cookiecutter_template}} automatically"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- credentials: "jenkins-mk"
- script: generate-cookiecutter-products-auto.groovy
- param:
- COOKIECUTTER_TEMPLATE_URL:
- type: string
- default: "https://gerrit.mcp.mirantis.net/p/mk/cookiecutter-templates.git"
- COOKIECUTTER_TEMPLATE_CREDENTIALS:
- type: string
- default: github-credentials
- COOKIECUTTER_TEMPLATE_BRANCH:
- type: string
- default: master
- COOKIECUTTER_TEMPLATE_PATH:
- type: string
- default: "./"
- COOKIECUTTER_TEMPLATE_CONTEXT:
- type: text
- RECLASS_MODEL_URL:
- type: string
- RECLASS_MODEL_CREDENTIALS:
- type: string
- default: gerrit
- RECLASS_MODEL_BRANCH:
- type: string
- default: master
- EMAIL_ADDRESS:
- type: string
- default: ""
\ No newline at end of file
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 587b3c4..56a2da2 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -17,9 +17,10 @@
credentials: "jenkins-mk"
script: generate-cookiecutter-products.groovy
param:
+ # Cookiecutter
COOKIECUTTER_TEMPLATE_URL:
type: string
- default: "https://gerrit.mcp.mirantis.net/p/mk/cookiecutter-templates.git"
+ default: "${_param:jenkins_gerrit_url}/mk/cookiecutter-templates.git"
COOKIECUTTER_TEMPLATE_CREDENTIALS:
type: string
default: github-credentials
@@ -31,17 +32,11 @@
default: "./"
COOKIECUTTER_TEMPLATE_CONTEXT:
type: text
- RECLASS_MODEL_URL:
+
+ # Other
+ SHARED_RECLASS_URL:
type: string
- RECLASS_MODEL_CREDENTIALS:
- type: string
- default: gerrit
- RECLASS_MODEL_BRANCH:
- type: string
- default: master
- COMMIT_CHANGES:
- type: boolean
- default: false
+ default: "${_param:jenkins_gerrit_url}/salt-models/reclass-system.git"
EMAIL_ADDRESS:
type: string
TEST_MODEL:
diff --git a/jenkins/client/job/salt-models/init.yml b/jenkins/client/job/salt-models/init.yml
index 9da1a34..7e5039a 100644
--- a/jenkins/client/job/salt-models/init.yml
+++ b/jenkins/client/job/salt-models/init.yml
@@ -2,7 +2,6 @@
- system.jenkins.client.job.salt-models.git-mirrors
- system.jenkins.client.job.salt-models.tests
- system.jenkins.client.job.salt-models.generate
- - system.jenkins.client.job.salt-models.generate-auto
parameters:
_param:
salt_formulas_branches: master