commit e299c99a094bd3a2a76fc3fa40e09c6eb2052c6c
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Jan 30 17:36:41 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Jan 30 17:36:41 2018 +0000
tree 14deb2bb4fffd5a38b22457e3991b406b19b463a
parent 3dbeb5a7d3cef232308b2a249b266149cba96f09
parent ebccba22a1a249effc691513ae18747316f9bfed

Merge "Add cred id for Artifactory and Salt to oscore systest job"

jenkins/client/job/oscore/tests.yml

diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index a330433..7779b3b 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -131,6 +131,14 @@
                 type: string
                 default: ""
                 description: "Defines a list of extra repos with parameters, format: repo 1, repo priority 1, repo pin 1; repo 2, repo priority 2, repo pin 2"
+              ARTIFACTORY_CREDENTIALS:
+                type: string
+                default: "artifactory"
+                description: Jenkins credential ID for Artifactory
+              SALT_MASTER_CREDENTIALS:
+                type: string
+                default: "salt-qa-credentials"
+                description: Jenkins credential ID for Salt master
         test-openstack-component-periodic:
           name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
           template: