aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-18 16:05:35 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-21 11:55:32 +0300
commitff090c1cf946e3df67795ce3c1437ec6246dbf37 (patch)
tree70bea9abc96078849986070154b3556493f9cf77
parent2c413c87e674e63bbd02ffaaacce22d5370bf82e (diff)
Add pristine-tar branches
Use mangled branch names ('pristine_tar' instead of 'pristine-tar') to not confuse pristine-tar tool. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xbootstrap.py5
-rw-r--r--test-repo-manifest.xml2
2 files changed, 5 insertions, 2 deletions
diff --git a/bootstrap.py b/bootstrap.py
index 9d86b79..2f3ded5 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -36,16 +36,17 @@ from tests.component.rpm import RepoManifest
LOG = logging.getLogger(os.path.basename(sys.argv[0]))
+# Use mangled pristine-tar branch names in order to not confuse pristine-tar
TEST_PKGS = {'gbp-test-native': {'build_branches': ['master'],
'export_branches': ['master']},
'gbp-test-native2': {'build_branches': ['master'],
'export_branches': ['master']},
'gbp-test': {'build_branches': ['master', 'fork'],
'export_branches': ['master', 'upstream',
- 'pq/master']},
+ 'pq/master', 'pristine_tar']},
'gbp-test2': {'build_branches': ['master'],
'export_branches': ['master', 'master-orphan',
- 'upstream']}}
+ 'upstream', 'pristine_tar']}}
class GitError(Exception):
diff --git a/test-repo-manifest.xml b/test-repo-manifest.xml
index 2028724..1b38b94 100644
--- a/test-repo-manifest.xml
+++ b/test-repo-manifest.xml
@@ -4,6 +4,7 @@
<branch name="master" orig_name="srcdata/gbp-test/master" revision="b82fd1a61db4221263b2c110f60c6d07cb0203df"/>
<branch name="upstream" orig_name="srcdata/gbp-test/upstream" revision="6450890aa002b0868537ee50cc1aea177fdcc941"/>
<branch name="pq/master" orig_name="srcdata/gbp-test/pq/master" revision="972ecde7c94eb00f4d310aa0e3e8f72ed215f591"/>
+ <branch name="pristine_tar" orig_name="srcdata/gbp-test/pristine_tar" revision="ee75150c3e9f3dacc1000d7ebc34a833e23b0356"/>
</project>
<project name="gbp-test-native2">
<branch name="master" orig_name="srcdata/gbp-test-native2/master" revision="3da6930adaaef1cf7c67c97244d72a4aaef13f00"/>
@@ -15,5 +16,6 @@
<branch name="master" orig_name="srcdata/gbp-test2/master" revision="cd2763432f4ad93b29c6f22aee7f623552156a81"/>
<branch name="master-orphan" orig_name="srcdata/gbp-test2/master-orphan" revision="33c84e86148c3707d2880f439529074296f03d29"/>
<branch name="upstream" orig_name="srcdata/gbp-test2/upstream" revision="6dccee0ab7689e5ae446d39535138ea39a88e70c"/>
+ <branch name="pristine_tar" orig_name="srcdata/gbp-test2/pristine_tar" revision="75e1ee1d3c0b920491cb9fc827be6de8cd9f0d9f"/>
</project>
</gbp-test-manifest>