[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.50-122-ga9723f6

Thu May 9 10:17:41 UTC 2013

The following commit has been merged in the develop branch:
commit 0d9587cfabdcd89ce8a95be35c9f8f894aa59da6
Merge: b2e404d8b06c200e794f21a5708e21d39e31c812 fcf6c482d3376b2e7a29b70aa7d75e4fe8425916
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue May 7 17:53:03 2013 +0200

    Merge branch 'develop' into piatti
    
    Conflicts, merged:
    	conf/distros.conf
    	debian/changelog
    	htdocs/index.tpl

diff --combined TODO
index 43746b7,b4de572..bfd1b3a

--- a/TODO
+++ b/TODO
@@@ -7,6 -7,8 +7,8 @@@ wishlist
  
  for 0.5x:
  
+ - handle .udebs more gracefully, see #699160 for details.
+ 
  - make piuparts-master + piuparts-slave packages work out-of-the-box:
    * piuparts-slave.postrm purge: clean up /var/cache/piuparts/tmp/
    - conf/piuparts.sudoers should be split for master+slave packages.
@@@ -28,7 -30,8 +30,8 @@@
    (since it may be used for remote ssh access to run the slave)
    granting permissions to %piuparts works against this
  
- - merge/cleanup README_piatti.txt and README_server.txt?
+ - re-read all documentation carefully and update were needed.
+   - merge/cleanup README_piatti.txt and README_server.txt?
  
  - in maintainer view: sort buggy states up again
  
@@@ -40,19 -43,17 +43,20 @@@
      existing data
  
  - sometimes a chroot doesn't get removed on piatti - find out why and fix it.
- - slave_run: cleanup stale proc mountpoints -> there is
-   ~piupartss/bin/slave_cleanup which should be executed at the beginning of
-   slave_run
- 
- - handle .udebs more gracefully, see #699160 for details.
  
- - re-read all documentation carefully and update were needed.
+ - check whether #660350 is really gone with a wheezy base system.
  
  - add a sample config with all possible keys set to some useful value
+   (like /usr/share/doc/apt/examples/configure-index.gz)
+ 
+ - look for a solution to use the global debian mirror for debian-backports, too
+   to avoid hardcoding a specific mirror in distros.conf
+ 
+ - sane default for known-problem-directory setting, or define it in piuparts.conf.sample
  
 +- look for a solution to use the global debian mirror for debian-backports, too
 +  to avoid hardcoding a specific mirror in distros.conf
 +
  
  for 0.6x:
  
@@@ -61,17 -62,19 +65,19 @@@
    http://andialbrecht.wordpress.com/2009/03/17/creating-a-man-page-with-distutils-and-optparse/
    - though this seems pretty complicated... maybe rather grep for
      parser.add_option and help= in piuparts.py ?!
+     - requires merging all the additional infomation in piuparts.1.txt into piuarts.py
+     - parsing piuparts --help output may be easier than parsing piuparts.py
  
  - rework known_problems:
+   - split detect_well_known_errors
+     * parsing the logfiles should stay there
+     * generating the html should be integrated into piuparts-report
    - use a number prefix for sorting
    - add title information
    - piuparts-report: "discover" the available known_problems, dont hardcode the
      list
    - drop _issue/_error duplication, have flags inside to indicate thether to
      generate _issues.tpl (pass/) and/or _error.tpl (fail/ bugged/ affected/)
-   - replace COMMAND with INCLUDE and EXCLUDE regular expressions, replacing the
-     existing shell calls, for an orders-of-magnitude speed improvement in kpr
-     creation
    - rework known problems to a python-friendlier format
  
  - accept a PIUPARTS_CONF environment variable everywhere to point to a different
@@@ -85,6 -88,7 +91,7 @@@
  - "decorate" (strike-through) bug links generated by piuparts-analyze to
    indicate resolved state (take package version into account!)
  
+ * verify that find_default_debian_mirrors does something sane
  - find_default_debian_mirrors: if parts[2] contains a / (think stable/updates
    for security.d.o), you can't ignore this, it will break later...
    + with distros.conf this may no longer be needed
@@@ -97,8 -101,8 +104,8 @@@
  
  - piuparts-slave: timestamps to log messages
  
- - the templates used by update-reports.py should be taken from
-   /etc/piuparts/templates/ and not be included in the python source
+ - the templates used by update-reports.py and detect_well_known_errors should
+   be taken from /etc/piuparts/templates/ and not be included in the python source
  
  - check the logfiles (especially pass/) for
    * "Exception in thread"
@@@ -141,6 -145,8 +148,8 @@@ for 0.7x and later
  - piuparts can't currently test upgrades of required packages.  (Because they
    cannot be removed, it assumes these are untestable, which is only true for
    removal tests...
+   - all distupgrade tests implicitly tests these upgrades, although not
+     individually per package
  
  - not sure if it's a sensible thing to to, but provide a way to turn off
    debugging output for piuparts.py - see
diff --combined instances/piuparts.conf.piatti
index 7b573c3,1b523bb..fc58a44
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@@ -13,8 -13,6 +13,8 @@@ flags-base 
  	--warn-on-others
  # default exceptions
  	--scriptsdir /etc/piuparts/scripts
 +# we need debsums from bpo-sloppy, until we have this, only emit warnings
 +	--warn-on-debsums-errors
  
  # default flags, only warning on leftover files
  flags-default =
@@@ -66,6 -64,8 +66,8 @@@ sections 
  	sid
  	testing2sid
  	sid2experimental
+ 	jessie
+ #	wheezy2jessie
  	wheezy
  	squeeze2wheezy
  	squeeze2bpo2wheezy
@@@ -76,20 -76,20 +78,20 @@@ mirror = http://piatti.debian.org/debia
  master-host = localhost
  master-user = piupartsm
  bts-from = piuparts-devel at lists.alioth.debian.org
- master-command = /org/piuparts.debian.org/share/piuparts/piuparts-master
+ master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
  piuparts-command =
  	sudo
  	env PYTHONPATH=%(PYTHONPATH)s
  	timeout -s INT -k 5m 35m
- 	/org/piuparts.debian.org/sbin/piuparts
- PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
- master-directory = /org/piuparts.debian.org/master
- slave-directory = /org/piuparts.debian.org/slave
- basetgz-directory = /org/piuparts.debian.org/slave/basetgz
- output-directory = /org/piuparts.debian.org/htdocs
- known-problem-directory = /org/piuparts.debian.org/share/piuparts/known_problems
- backup-directory = /org/piuparts.debian.org/backup
- tmpdir = /org/piuparts.debian.org/tmp
+ 	/srv/piuparts.debian.org/sbin/piuparts
+ PYTHONPATH = /srv/piuparts.debian.org/lib/python2.6/dist-packages:/srv/piuparts.debian.org/lib/python2.7/dist-packages
+ master-directory = /srv/piuparts.debian.org/master
+ slave-directory = /srv/piuparts.debian.org/slave
+ basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
+ output-directory = /srv/piuparts.debian.org/htdocs
+ known-problem-directory = /srv/piuparts.debian.org/share/piuparts/known_problems
+ backup-directory = /srv/piuparts.debian.org/backup
+ tmpdir = /srv/piuparts.debian.org/tmp
  doc-root = /
  # 30*60
  idle-sleep = 1800
@@@ -139,6 -139,26 +141,26 @@@ upgrade-test-distros = sid experimenta
  log-file = sid2experimental.log
  
  
+ [jessie]
+ precedence = 2
+ piuparts-flags =
+ 	%(flags-default)s
+ distro = jessie
+ log-file = jessie.log
+ # 1 week (60*60*24*7)
+ max-tgz-age = 604800
+ 
+ 
+ [wheezy2jessie]
+ precedence = 3
+ piuparts-flags =
+ 	%(flags-default)s
+ 	%(flags-start-wheezy)s
+ distro = wheezy
+ upgrade-test-distros = wheezy jessie
+ log-file = wheezy2jessie.log
+ 
+ 
  [wheezy]
  precedence = 2
  piuparts-flags =
@@@ -147,8 -167,8 +169,8 @@@
  	%(flags-end-wheezy)s
  distro = wheezy
  log-file = wheezy.log
- # 1 week (60*60*24*7)
- max-tgz-age = 604800
+ # 1 month (60*60*24*30)
+ max-tgz-age = 2592000
  
  
  [squeeze2wheezy]

-- 
piuparts git repository

