saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

configurable salt git url for jenkins

Browse source
This commit is contained in:
Mathieu Le Marec - Pasquet 2014-01-02 22:43:44 +01:00
parent e9c7038b3c
commit 0e430e531d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/jenkins.py
View file

@ -264,7 +264,10 @@ def run(opts):
'salt -t 1800 {vm_name} state.sls {sls} pillar="{pillar}" '
'--no-color'.format(
sls=opts.sls,
pillar=opts.pillar.format(commit=opts.commit),
pillar=opts.pillar.format(
commit=opts.commit,
salt_url=opts.salt_url
),
vm_name=vm_name,
commit=opts.commit
)
@ -337,6 +340,10 @@ def parse():
'--provider',
default=os.environ.get('JENKINS_SALTCLOUD_VM_PROVIDER', None),
help='The vm provider')
parser.add_option(
'--salt-url',
default='https://github.com/saltstack/salt.git',
help='The salt git repository url')
parser.add_option(
'--commit',
help='The git commit to track')
@ -346,7 +353,7 @@ def parse():
help='The sls file to execute')
parser.add_option(
'--pillar',
default='{{git_commit: {commit}}}',
default='{{git_commit: {commit}, git_url: {salt_url}}}',
help='Pillar values to pass to the sls file')
parser.add_option(
'--no-clean',