valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add SRPM to build artifacts for automated RPM builds

Browse Source
This commit is contained in:
Erik Johnson 2014-09-12 01:14:03 -05:00
parent 53ce42428a
commit 3ea1fe064e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/buildpackage.py
View File

@ -80,7 +80,7 @@ def _init():
help='Source directory. Must be a git checkout. '
'(default: %default)')
path_group.add_option('--build-dir',
default='/tmp/saltpkg',
default='/tmp/salt-buildpackage',
help='Build root, will be removed if it exists '
'prior to running script. (default: %default)')
path_group.add_option('--artifact-dir',
@ -300,7 +300,7 @@ def build_centos(opts):
fp_.write(line + '\n')
# Do the thing
cmd = ['rpmbuild', '-bb']
cmd = ['rpmbuild', '-ba']
cmd.extend(define_opts)
cmd.append(spec_path)
stdout, stderr, rcode = _run_command(cmd)
@ -308,7 +308,7 @@ def build_centos(opts):
if rcode != 0:
_abort('Build failed.')
return glob.glob(
packages = glob.glob(
os.path.join(
opts.build_dir,
'RPMS',
@ -316,6 +316,16 @@ def build_centos(opts):
'salt-*{0}*.noarch.rpm'.format(salt_pkgver)
)
)
packages.extend(
glob.glob(
os.path.join(
opts.build_dir,
'SRPMS',
'salt-{0}*.src.rpm'.format(salt_pkgver)
)
)
)
return packages
# MAIN