rallytime
92e0c17645
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-05-09 13:55:06 -06:00
rallytime
0fd5e9d157
Merge branch '2015.5' into '2015.8'
...
Conflits:
- salt/minion.py
- tests/integration/states/file.py
2016-05-06 12:04:06 -06:00
Justin Anderson
d4928c5a22
Use saltstack repo in buildpackage.py on CentOS 5 ( #33080 )
2016-05-06 08:27:31 -07:00
Erik Johnson
80f7c31d53
buildpackage.py: add salt.bash to SOURCES
2016-04-04 16:53:56 -05:00
Craig Rodrigues
381e8cc144
Use print as a function [PEP 3105].
...
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
2015-12-04 16:17:35 -08:00
Erik Johnson
84cc66b7b9
tests/buildpackage.py: remove raw string formatting
2015-08-26 23:26:07 -05:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
80b07f3578
Merge branch '2014.7' into '2015.2'
...
Conflicts:
tests/buildpackage.py
2015-01-06 20:32:36 -07:00
Pedro Algarvio
a9eaf187e1
Ignore the file perms lint check
2015-01-07 01:15:56 +00:00
Nitin Madhok
c992f04f32
Changing permissions of test files and fixing lint violations
2014-12-19 05:50:18 -05:00
Thomas S Hatch
2546c489f8
try out pylint disable for perms
2014-12-18 10:43:41 -07:00
Erik Johnson
3f19d518fb
Fix --define directive for Cent5 builds
2014-09-16 18:16:44 -05:00
Erik Johnson
3ea1fe064e
Add SRPM to build artifacts for automated RPM builds
2014-09-12 01:35:15 -05:00
Erik Johnson
53ce42428a
Rename --dest-dir to --build-dir
...
``--build-dir`` is a more accurate name. ``--dest-dir`` seems to suggest
that this is where the packages ultimately end up. While it's true that
the packages do end up within that directory, they are copied to the
artifact directory, from which they are ultimately retrieved by the
jenkins master.
2014-09-12 01:35:08 -05:00
Erik Johnson
e22c000d5c
Create the build log in the artifact dir
...
This allows the jenkins master to receive the log file even if the build
script aborted. Before I was just copying the log file to the artifact
dir at the end of the script, which meant that jenkins only gets the log
when the script succeeds.
2014-09-11 13:08:40 -05:00
Erik Johnson
9452709cb3
Lint fixes
2014-09-08 14:02:18 -05:00
Erik Johnson
60e606d250
Fix relative paths, move build log to artifact dir
2014-09-08 12:07:29 -05:00
Erik Johnson
40ce199736
make logger global for buildpackage.py
2014-09-05 16:30:26 -05:00
Erik Johnson
aa9a0555e0
Add buildpackage.py
2014-09-05 15:04:46 -05:00
