commit d83a77555b4d06228b96f42aa32a76885bf5fd59
author Petr Michalec <pmichalec@mirantis.com> Tue Jul 24 11:54:33 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Tue Jul 24 11:54:33 2018 +0000
tree 4a2ed6ff7cf2f07ee550cb8ee8245d9fb5322049
parent d816199a583281ab670c54d19cfdd5d9c32a4f41
parent 056199897e1750620903b62821a794c1bf12c003

Merge "Add RECLASS_VERSION to cookiecutter test jobs"

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 686e74d..002c618 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -28,3 +28,7 @@
               TEST_MODEL:
                 type: boolean
                 default: false
+              RECLASS_VERSION:
+                type: string
+                default: 'v1.5.4'
+                description: "Version (branch) of Reclass we will use"

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

diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index c820d26..7c327e8 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -295,6 +295,10 @@
               EXTRA_FORMULAS:
                 type: string
                 default: "aptly artifactory auditd backupninja collectd devops-portal docker elasticsearch fluentd freeipa gerrit glusterfs grafana haproxy heka horizon influxdb jenkins keepalived kibana libvirt maas memcached mysql nginx ntp openldap openssh postfix prometheus rsync rsyslog rundeck sensu sphinx telegraf xtrabackup watchdog"
+              RECLASS_VERSION:
+                type: string
+                default: 'v1.5.4'
+                description: "Version (branch) of Reclass we will use"
       job:
         test-salt-model-node:
           name: test-salt-model-node