Commit graph

588 commits

Author SHA1 Message Date
Paul Morgan
74911c8506 add mailmap for cleaner shortlog output 2014-05-31 20:47:08 +00:00
Devan Goodwin
30003b48ff Merge pull request #136 from jumanjiman/rm
remove intermediate containers in test harness
2014-05-27 08:48:16 -03:00
Paul Morgan
58e6360698 remove intermediate containers in test harness
Save disk space on workstation.
2014-05-26 23:49:22 +00:00
Devan Goodwin
fd48262fbb Merge pull request #134 from jumanjiman/issue_133
add build dependency for el5 and new functional tests
2014-05-26 16:04:43 -03:00
Paul Morgan
cd0cc194be add build dependency for el5 and new functional tests
* asciidoc indirectly requires docbook-style-xsl on el6 and f20,
  but not on el5. Resolve failure to build tito with tito on el5:
  "I/O error : Attempt to load network entity"

* Resolve "egg missing file" on el5 due to busted symlinks
  from 20c4f1b7c0.

* Add functional test to build tito with itself in order to
  catch problems like the ones above.

Closes https://github.com/dgoodwin/tito/issues/133
2014-05-26 18:37:00 +00:00
Devan Goodwin
10700b66f5 Merge pull request #131 from domcleal/builder-cleanup
Cleanup builders on interruption when called directly
2014-05-19 12:13:21 -03:00
Dominic Cleal
e434f14459 Cleanup builders on interruption when called directly 2014-05-19 11:08:04 +01:00
Devan Goodwin
71c857add4 Automatic commit of package [tito] release [0.5.5-1]. 2014-05-16 13:04:40 -03:00
Devan Goodwin
8be80a288e Merge pull request #130 from domcleal/git-annex-cleanup
Fix bugs in git-annex cleanup method
2014-05-16 10:52:17 -03:00
Devan Goodwin
48e4fcedca Fix a test issue. 2014-05-16 10:52:01 -03:00
Dominic Cleal
993ca4cedc Fix bugs in git-annex cleanup method 2014-05-16 13:16:37 +01:00
Devan Goodwin
51eabdf0ac Merge pull request #129 from domcleal/noisy-whitespace
Remove excess whitespace on EL6 and duplicate SRPM output
2014-05-16 08:30:23 -03:00
Dominic Cleal
596cb07e68 Remove excess whitespace on EL6 and duplicate SRPM output 2014-05-16 11:08:49 +01:00
Devan Goodwin
24693f7584 Automatic commit of package [tito] release [0.5.4-1]. 2014-05-12 11:11:03 -03:00
Devan Goodwin
cb6985b205 Merge pull request #127 from jumanjiman/python3_cmp
make version comparison compat with python2 and python3
2014-05-12 10:59:30 -03:00
Dominic Cleal
5eadb047aa Move compare_version test into correct class 2014-05-12 13:07:09 +00:00
Paul Morgan
576d46345f make version comparison compat with python2 and python3
Alas, python3 doesn't have the cmp() function.

Support both python2 and python3 for comparisons using tip from
https://docs.python.org/3.0/whatsnew/3.0.html#ordering-comparisons

Avoids TB on python3:

    ======================================================================
    ERROR: test_compare_version (unit.common-tests.ExtractBugzillasTest)
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/home/sandbox/test/unit/common-tests.py", line 224, in test_compare_version
        self.assertEquals(0, compare_version("1", "1"))
      File "/home/sandbox/src/tito/common.py", line 689, in compare_version
        return cmp(normalize(version1), normalize(version2))
    NameError: global name 'cmp' is not defined
2014-05-12 12:25:18 +00:00
Devan Goodwin
0ecdf60026 Automatic commit of package [tito] release [0.5.3-1]. 2014-05-12 08:52:17 -03:00
Devan Goodwin
b4c103ea4f Merge pull request #125 from domcleal/git-annex-el6
Support pre-5.20131213 versions of git-annex for EL6
2014-05-12 08:50:42 -03:00
Devan Goodwin
68326173d4 Merge pull request #126 from jumanjiman/el5
avoid syntax error on el5
2014-05-12 08:34:48 -03:00
Paul Morgan
3f78f626b0 avoid syntax error on el5
run_command_print originally used trailing comma to suppress newline,
but python3 needs a named argument (`end=`) [1].

38446dca added 'from future...' to support python3's `end=` argument,
but the import causes error on el5:

    SyntaxError (future feature print_function is not defined

6b9787e2 introduced an approach to strip newlines compatible
with both el5's python2 and fedora 20's python3.

This means we don't need the future import any more, and
we can safely remove it to restore el5 compatibility.

[1] https://docs.python.org/3.0/whatsnew/3.0.html#print-is-a-function
2014-05-11 20:55:07 +00:00
Devan Goodwin
f7b6311d8c Automatic commit of package [tito] release [0.5.2-1]. 2014-05-09 13:55:36 -03:00
Devan Goodwin
373f8bcf61 Fix releaser getcwd error. 2014-05-09 13:54:21 -03:00
Devan Goodwin
cc75aa3d63 Update releasers. 2014-05-09 13:45:16 -03:00
Devan Goodwin
ed9bb820c0 Automatic commit of package [tito] release [0.5.1-1]. 2014-05-09 12:38:07 -03:00
Devan Goodwin
2a54ad3ce4 Raise error on failed run_command.
Lost this somehow in refactoring, but right now failed commands are silent.
Raise an exception and print the error details.

Restore behaviour where we can print command output on success if desired.

Fix a couple tests that were actually failing due to missing rsync dest.
2014-05-09 11:54:30 -03:00
Devan Goodwin
e3c4b269e8 Merge branch 'test-without-tag' of https://github.com/domcleal/tito into domcleal-test-without-tag
Conflicts:
	test/functional/builder_tests.py
2014-05-09 11:39:50 -03:00
Devan Goodwin
59b6b9c855 Merge pull request #122 from domcleal/scl-builder-arg
Add 'scl' builder option for software collection name
2014-05-09 11:11:37 -03:00
Devan Goodwin
dd46720860 Merge branch 'xsuchy-run_command_print' 2014-05-09 11:07:04 -03:00
Devan Goodwin
071278cfc9 Fix pep8 issues. 2014-05-09 11:06:53 -03:00
Dominic Cleal
bb60a6dede Support pre-5.20131213 versions of git-annex for EL6
Older versions of git-annex don't support `git annex lock --force`, so peform
a version check and call without --force on these.

The EL6 Docker image is changed to one that contains locales, in order for
git-annex to run successfully.
2014-05-09 13:57:53 +01:00
Dominic Cleal
7a032a2d69 Add version comparison utility
Source: http://stackoverflow.com/a/1714190/146925
Credit: gnud <http://stackoverflow.com/users/27204/gnud>
2014-05-09 13:57:53 +01:00
Devan Goodwin
6b9787e230 Fix print without newline for EL5. 2014-05-09 09:36:38 -03:00
Devan Goodwin
79387a4038 Merge branch 'run_command_print' of https://github.com/xsuchy/tito into xsuchy-run_command_print 2014-05-09 09:18:28 -03:00
Dominic Cleal
e3b24b15ed Allow builder to run in test mode on untagged project
Particularly useful when creating new projects and wanting to avoid
creating an initial tag, this allows `tito build --test --srpm` etc
to run without any tag.
2014-05-05 09:02:53 +01:00
Dominic Cleal
9ca849b7d9 Add 'scl' builder option for software collection name
With a general 'scl' builder option, a software collection name can be
specified irrespective of the releaser used.  RsyncReleaser's own 'scl'
option has been deprecated in favour of using 'builder.scl' in
releasers.conf.
2014-05-04 21:33:54 +01:00
Devan Goodwin
4032c3d300 Merge pull request #121 from jumanjiman/hacking
propagate docs to docker public registry
2014-04-24 15:44:25 -03:00
Devan Goodwin
7e816fef50 Merge pull request #120 from jumanjiman/wercker
use wercker instead of travis-ci to enable full test harness
2014-04-24 15:44:04 -03:00
Devan Goodwin
f554119588 Merge pull request #116 from domcleal/cleanup
Cleanup releasers + builders when interrupted
2014-04-24 15:43:01 -03:00
Devan Goodwin
3304712d00 Merge pull request #118 from venth/rpmbuild-errors
added rpmbuild output to an error raised by tito to easier the error's cause analysis
2014-04-24 15:42:27 -03:00
alfen
66baaa4bd2 added rpmbuild output to an error raised by tito to easier the error's cause analysis 2014-04-20 18:55:26 +02:00
alfen
3b8cad219b ignored virtualenv and intellij related directories 2014-04-20 18:52:34 +02:00
Paul Morgan
20c4f1b7c0 propagate docs to docker public registry
Add URL of upstream tito repo to HACKING, then
symlink HACKING as README.md in each Dockerfile dir.

Why?

If a README.md exists in same dir as Dockerfile (incl. symlink),
and it's set up as a
[trusted build](https://index.docker.io/help/docs/#trustedbuilds),
then index.docker.io automatically shows the readme on the info
page of the trusted build.
2014-04-19 21:05:15 +00:00
Paul Morgan
8aedb221bb use wercker instead of travis-ci to enable full test harness
Before this commit: We use travis-ci (ubuntu vm) to run
just the unit tests. We cannot run functional tests on
travis-ci due to lack of platform support.

After this commit: Run the full dockerized test harness on
http://wercker.com to run `hacking/runtests.sh`, which runs
all the unit and functional tests on el5, el6, and f20 to
assert supportability on all the pythons 2.4 through 3.x.

Sample test runs are at:
https://app.wercker.com/#buildstep/5346d0054daac943370042c7
https://app.wercker.com/#buildstep/5346d9914daac94337005096

At the above link...

1. Click **run the docker test suite** in browser to show log
2. Scroll all the way through to see the verbose output and
   summary at bottom.

Note: `hacking/runtests.sh` exits non-zero if any test fails
on any of the platforms.

Wercker docs are online at http://devcenter.wercker.com/#
2014-04-10 17:59:56 +00:00
Devan Goodwin
50047b5952 Merge pull request #119 from jumanjiman/oops
spec: remove dependency on GitPython
2014-04-10 14:59:04 -03:00
Paul Morgan
3da937d27b spec: remove dependency on GitPython
3ae1596923 removed GitPython
from the source, but forgot to remove the dependency from
the rpm spec file.
2014-04-10 17:55:53 +00:00
Devan Goodwin
8b964ac5e8 Merge pull request #117 from slagle/builder-arg
Update tito.8.asciidoc
2014-04-08 10:12:07 -03:00
James Slagle
f1af6f6dcf Update tito.8.asciidoc
--builder-arg is now just called --arg.
2014-04-08 09:08:44 -04:00
Dominic Cleal
0c7684ae8a Cleanup releasers + builders when interrupted
When receiving a keyboard interrupt (SIGINT) the releaser cleanup
is now called, and the builder is in turn cleaned up.
2014-04-08 08:59:22 +01:00
Miroslav Suchý
38446dca5b make run_command_print() compatible with python3 2014-04-03 15:54:47 +02:00