commit 4d9ac48ce89da50c4e9abbaef306a75ca21c6a89
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Sep 27 14:29:31 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Thu Sep 27 14:29:31 2018 +0000
tree 803ef79d0aff364b1d860388da5a0313754bff01
parent 272d62e9a102d3c32a52aa92b01cb5dd478d3b88
parent b09bdcc7c021f15812b39a822e7c3ef17f16f9ab

Merge "Add RUN_SECURITY_CHECK parameter"

jenkins/client/credential/jenkins.yml

diff --git a/jenkins/client/credential/jenkins.yml b/jenkins/client/credential/jenkins.yml
new file mode 100644
index 0000000..da373db
--- /dev/null
+++ b/jenkins/client/credential/jenkins.yml
@@ -0,0 +1,8 @@
+parameters:
+  jenkins:
+    client:
+      credential:
+        jenkins:
+          desc: Credentials to access this Jenkins instance
+          username: ${_param:jenkins_client_user}
+          password: ${_param:jenkins_client_password}

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

diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index ca8d0a5..b5b286d 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -153,6 +153,7 @@
                   salt-formulas/{{name}}:
                     branches:
                       - master
+                      - '2018.8.1'
                 event:
                   comment:
                     - addedContains: