Debug git builds.

rpki-pbuilder.py

@@ -48,7 +48,7 @@ parser.add_argument("--lockfile", default = os.path.expanduser("~/builder.lock")
 parser.add_argument("--keyring",  default = os.path.expanduser("~/.gnupg/pubring.gpg"),
                     help = "PGP keyring")
 parser.add_argument("--git-tree", default = os.path.expanduser("~/source/master/"),
-                    help = "subversion tree")
+                    help = "git tree")
 parser.add_argument("--apt-tree", default = os.path.expanduser("~/repository/"),
                     help = "reprepro repository")
 parser.add_argument("--apt-user", default = "aptbot",
@@ -61,7 +61,7 @@ parser.add_argument("--url-path", default = "/APT",
                     help = "path of apt repository on public web server")
 parser.add_argument("--backports", nargs = "+", default = ["python-django", "python-tornado"],
                     help = "backports needed for this build")
-parser.add_argument("--releases", nargs = "+", default = ["ubuntu/trusty", "debian/wheezy", "ubuntu/precise"],
+parser.add_argument("--releases", nargs = "+", default = ["debian/jessie", "ubuntu/xenial"],
                     help = "releases for which to build")
 args = parser.parse_args()
 
@@ -349,7 +349,7 @@ def rsync(*flags):
                      cmd[-1], " ".join(flags))
         run(*cmd)
     else:
-        logging.info("Would have synched repository to %s with flags %",
+        logging.info("Would have synched repository to %s with flags %s",
                      cmd[-1], " ".join(flags))
 
 rsync("--ignore-existing")

rpki-pbuilder.sh

@@ -1,16 +1,5 @@
 #!/bin/sh -
 
-# New top-level script, now that we need to run rpki-pbuilder.py multiple times with different arguments.
-# May eventually want to consolidate all of this back into rpki-pbuilder.py, but not today.
-
-# At the moment, coverage with the new code is a bit scattershot.  It works with trusty, with backports
-# from xenial; it works for stretch, and it works for jessie with a lot of backports from stretch.
-# Backports for wheezy are probably more trouble than they're worth, and there seems little point
-# in putting effort into the non-LTS Ubuntu releases.
-#
-# In practice, the old code no longer builds for precise, which is an LTS that's still under support.
-# Don't yet know why.
-
 /usr/sbin/logrotate -s $HOME/logrotate.state $HOME/logrotate.conf
 
 exec >> $HOME/builder.log 2>&1
@@ -20,41 +9,7 @@ set -x
 cd $HOME
 
 python rpki-pbuilder.py					\
-    --svn-tree $HOME/source.ng/tk705/			\
-    --apt-tree $HOME/repository.ng/			\
-    --url-path /APTng					\
-    --backports python-django python-tornado		\
-    --releases ubuntu/trusty
-
-python rpki-pbuilder.py					\
-    --svn-tree $HOME/source.ng/tk705/			\
-    --apt-tree $HOME/repository.ng/			\
-    --url-path /APTng					\
-    --releases ubuntu/xenial
-
-python rpki-pbuilder.py					\
-    --svn-tree $HOME/source.ng/tk705/			\
+    --git-tree $HOME/source.ng/master/			\
     --apt-tree $HOME/repository.ng/			\
     --url-path /APTng					\
-    --releases debian/jessie
-
-python rpki-pbuilder.py					\
-    --svn-tree $HOME/source.tos/trunk/			\
-    --apt-tree $HOME/repository.tos/			\
-    --url-path /APT					\
-    --backports python-django-south			\
-    --releases ubuntu/trusty
-
-python rpki-pbuilder.py					\
-    --svn-tree $HOME/source.tos/trunk/			\
-    --apt-tree $HOME/repository.tos/			\
-    --url-path /APT					\
-    --backports python-django python-django-south	\
-    --releases debian/wheezy
-
-python rpki-pbuilder.py					\
-    --svn-tree $HOME/source.tos/trunk/			\
-    --apt-tree $HOME/repository.tos/			\
-    --url-path /APT					\
-    --backports python-django python-django-south	\
-    --releases ubuntu/precise
+    --releases debian/jessie ubuntu/xenial