[Piuparts-commits] [piuparts] 01/01: Drop instances/piuparts.conf.lamarr and …/piuparts.conf.goldwasser.

Sun Mar 5 15:22:56 UTC 2017

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit b3c25f89aa78f4f0d5d88586a2029150b2695df7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Mar 5 16:20:26 2017 +0100

    Drop instances/piuparts.conf.lamarr and …/piuparts.conf.goldwasser.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 README_server.txt                  |   2 +-
 debian/changelog                   |   3 +-
 instances/piuparts.conf.goldwasser | 136 -------------------------------------
 instances/piuparts.conf.lamarr     | 136 -------------------------------------
 4 files changed, 3 insertions(+), 274 deletions(-)

diff --git a/README_server.txt b/README_server.txt
index 506d514..77e0b67 100644
--- a/README_server.txt
+++ b/README_server.txt
@@ -571,7 +571,7 @@ link:https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/README_pejacevic
 To generate the report on the master host run:
 
 ----
-piupartsm at goldwasser:~$ /usr/share/piuparts/master/generate_daily_report
+piupartsm at pejacevic:~$ /usr/share/piuparts/master/generate_daily_report
 ----
 
 // vim: set filetype=asciidoc:
diff --git a/debian/changelog b/debian/changelog
index a12bb63..a47b22a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,7 +38,7 @@ piuparts (0.76) UNRELEASED; urgency=medium
     started than defined in the configuration. Also add a check to ensure that
     this optional argument is an integer and within the defined maximum number
     of slaves.
-  * Update README_pejacevic.txt.
+  * Update README_pejacevic.txt and README_server.txt.
   * Update (the unused example) piuparts.conf.piu-slave-1und1-01 to match
     piuparts.conf.piu-slave-bm-a except for arch and mirror.
   * Add instances/piuparts.conf.piu-slave-ubc-01 based on
@@ -46,6 +46,7 @@ piuparts (0.76) UNRELEASED; urgency=medium
     Thanks to DSA for setting up this 2nd test node!
   * Update instances/piuparts.conf.piu-slave-1und1-01 to match the other
     examples, except for the wanted differences (=arch and mirror).
+  * Drop instances/piuparts.conf.lamarr and …/piuparts.conf.goldwasser.
   * htdocs/index.tpl:
     - Announce 2nd piuparts-slave and explain this is a three host setup now.
     - Make "contribute" a link.
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
deleted file mode 100644
index ed49e1c..0000000
--- a/instances/piuparts.conf.goldwasser
+++ /dev/null
@@ -1,136 +0,0 @@
-#
-# This is the configuration file for piuparts running in master-slave mode on a (development) host called goldwasser
-#
-# For more information on this setup see /usr/share/doc/piuparts-master/README_server.txt
-#
-
-[DEFAULT]
-# these are needed always
-flags-base =
-# see https://bugs.debian.org/604807
-	--skip-logrotatefiles-test
-# restrict to problems in the package being tested
-	--warn-on-others
-# default exceptions
-	--scriptsdir /etc/piuparts/scripts
-
-# default flags, only warning on leftover files
-flags-default =
-	%(flags-base)s
-	--warn-on-leftovers-after-purge
-
-# like default flags, but failing on leftover files
-flags-leftovers =
-	%(flags-base)s
-# perform some additional cleanup
-	--scriptsdir /etc/piuparts/scripts-leftovers
-
-# common flags for starting a test in wheezy
-flags-start-wheezy =
-# no flags needed
-
-# common flags for tests ending in wheezy
-flags-end-wheezy =
-# extra fake-essential packages for successfully purging in wheezy
-	--scriptsdir /etc/piuparts/scripts-wheezy
-# debsums failures won't be fixed in wheezy
-	--warn-on-debsums-errors
-
-# common flags for starting a test in squeeze
-flags-start-squeeze =
-# eatmydata was added post-squeeze
-	--no-eatmydata
-# up to squeeze a non-empty /etc/shells was shipped, actually installing
-# and removing a shell would remove its entry from /etc/shells
-	-i /etc/shells
-# squeeze has been archived
-	--no-check-valid-until
-
-# common flags for tests ending in squeeze
-flags-end-squeeze =
-# extra fake-essential packages for successfully purging in squeeze
-	--scriptsdir /etc/piuparts/scripts-squeeze
-# debsums failures won't be fixed in squeeze
-	--warn-on-debsums-errors
-
-# common flags for starting a test in lenny
-flags-start-lenny =
-# dpkg --force-unsafe-io was added in squeeze
-	--dpkg-noforce-unsafe-io
-# same flags needed as in squeeze
-        %(flags-start-squeeze)s
-
-
-[global]
-sections =
-#	sid
-#	jessie
-	wheezy2jessie
-#	squeeze
-	squeeze2squeeze-lts
-
-mirror = http://ftp.de.debian.org/debian/
-master-host = goldwasser
-master-user = piupartsm
-bts-from = piuparts-devel at lists.alioth.debian.org
-master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
-piuparts-command =
-	timeout -s INT -k 5m 35m
-	sudo /usr/sbin/piuparts
-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
-backup-directory = /srv/piuparts.debian.org/backup
-tmpdir = /srv/piuparts.debian.org/tmp
-doc-root = /piuparts
-components = main
-# this value is too high for production (it will cause piuparts-slave to sleep
-# for a whole day) but useful for testing master-slave mode, for running on a
-# test system 24/7 without causing load for 24/7
-idle-sleep = 86400
-max-reserved = 10
-
-
-[sid]
-description = + Fails if there are leftover files after purge.
-piuparts-flags =
-	%(flags-leftovers)s
-distro = sid
-arch = amd64
-# Once there are no packages left which leave files on purge behind,
-# --pedantic-purge-test should be added
-
-[jessie]
-piuparts-flags =
-	%(flags-default)s
-distro = jessie
-arch = amd64
-
-[wheezy2jessie]
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-wheezy)s
-arch = amd64
-upgrade-test-distros = wheezy jessie
-
-[squeeze]
-json-sections = none
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-squeeze)s
-	%(flags-end-squeeze)s
-distro = squeeze
-arch = amd64
-reschedule-old-count = 50
-
-[squeeze2squeeze-lts]
-json-sections = none
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-squeeze)s
-	%(flags-end-squeeze)s
-depends-sections = squeeze
-area = main
-arch = amd64
-upgrade-test-distros = squeeze squeeze-lts
diff --git a/instances/piuparts.conf.lamarr b/instances/piuparts.conf.lamarr
deleted file mode 100644
index 07dc94b..0000000
--- a/instances/piuparts.conf.lamarr
+++ /dev/null
@@ -1,136 +0,0 @@
-#
-# This is the configuration file for piuparts running in master-slave mode on a (development) host called lamarr
-#
-# For more information on this setup see /usr/share/doc/piuparts-master/README_server.txt
-#
-
-[DEFAULT]
-# these are needed always
-flags-base =
-# see https://bugs.debian.org/604807
-	--skip-logrotatefiles-test
-# restrict to problems in the package being tested
-	--warn-on-others
-# default exceptions
-	--scriptsdir /etc/piuparts/scripts
-
-# default flags, only warning on leftover files
-flags-default =
-	%(flags-base)s
-	--warn-on-leftovers-after-purge
-
-# like default flags, but failing on leftover files
-flags-leftovers =
-	%(flags-base)s
-# perform some additional cleanup
-	--scriptsdir /etc/piuparts/scripts-leftovers
-
-# common flags for starting a test in wheezy
-flags-start-wheezy =
-# no flags needed
-
-# common flags for tests ending in wheezy
-flags-end-wheezy =
-# extra fake-essential packages for successfully purging in wheezy
-	--scriptsdir /etc/piuparts/scripts-wheezy
-# debsums failures won't be fixed in wheezy
-	--warn-on-debsums-errors
-
-# common flags for starting a test in squeeze
-flags-start-squeeze =
-# eatmydata was added post-squeeze
-	--no-eatmydata
-# up to squeeze a non-empty /etc/shells was shipped, actually installing
-# and removing a shell would remove its entry from /etc/shells
-	-i /etc/shells
-# squeeze has been archived
-	--no-check-valid-until
-
-# common flags for tests ending in squeeze
-flags-end-squeeze =
-# extra fake-essential packages for successfully purging in squeeze
-	--scriptsdir /etc/piuparts/scripts-squeeze
-# debsums failures won't be fixed in squeeze
-	--warn-on-debsums-errors
-
-# common flags for starting a test in lenny
-flags-start-lenny =
-# dpkg --force-unsafe-io was added in squeeze
-	--dpkg-noforce-unsafe-io
-# same flags needed as in squeeze
-        %(flags-start-squeeze)s
-
-
-[global]
-sections =
-#	sid
-#	jessie
-	wheezy2jessie
-#	squeeze
-	squeeze2squeeze-lts
-
-mirror = http://ftp.de.debian.org/debian/
-master-host = goldwasser
-master-user = piupartsm
-bts-from = piuparts-devel at lists.alioth.debian.org
-master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
-piuparts-command =
-	timeout -s INT -k 5m 35m
-	sudo /usr/sbin/piuparts
-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
-backup-directory = /srv/piuparts.debian.org/backup
-tmpdir = /srv/piuparts.debian.org/tmp
-doc-root = /piuparts
-components = main
-# this value is too high for production (it will cause piuparts-slave to sleep
-# for a whole day) but useful for testing master-slave mode, for running on a
-# test system 24/7 without causing load for 24/7
-idle-sleep = 86400
-max-reserved = 10
-
-
-[sid]
-description = + Fails if there are leftover files after purge.
-piuparts-flags =
-	%(flags-leftovers)s
-distro = sid
-arch = i386
-# Once there are no packages left which leave files on purge behind,
-# --pedantic-purge-test should be added
-
-[jessie]
-piuparts-flags =
-	%(flags-default)s
-distro = jessie
-arch = i386
-
-[wheezy2jessie]
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-wheezy)s
-arch = i386
-upgrade-test-distros = wheezy jessie
-
-[squeeze]
-json-sections = none
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-squeeze)s
-	%(flags-end-squeeze)s
-distro = squeeze
-arch = i386
-reschedule-old-count = 50
-
-[squeeze2squeeze-lts]
-json-sections = none
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-squeeze)s
-	%(flags-end-squeeze)s
-depends-sections = squeeze
-area = main
-arch = i386
-upgrade-test-distros = squeeze squeeze-lts

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git

