[Piuparts-devel] [Git][debian/piuparts][develop] instances/*, docs/README_pejacevic.txt and htdocs/index: stop mentioning piu-slave-bm-a.debian.org

Sun Dec 29 18:39:46 GMT 2019


Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
c88b177f by Holger Levsen at 2019-12-29T18:39:33Z
instances/*, docs/README_pejacevic.txt and htdocs/index: stop mentioning piu-slave-bm-a.debian.org

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


8 changed files:

- debian/changelog
- docs/README_pejacevic.txt
- htdocs/index.tpl
- instances/Makefile
- instances/piuparts.conf-header.pejacevic
- instances/piuparts.conf-header.piu-slave-1und1-01
- − instances/piuparts.conf-header.piu-slave-bm-a
- instances/piuparts.conf-header.piu-slave-ubc-01


Changes:

=====================================
debian/changelog
=====================================
@@ -51,6 +51,8 @@ piuparts (1.1.0) UNRELEASED; urgency=medium
     - bump debhelper-compat to 12.
     - remove myself from uploaders. It was fun! Policy is your friend. Trust
       the Policy. Love the Policy. Obey the Policy.
+  * instances/*, docs/README_pejacevic.txt and htdocs/index: stop mentioning
+    piu-slave-bm-a.debian.org.
 
   [ David Prévot ]
   * Use the same favicon as the one from www.d.o.


=====================================
docs/README_pejacevic.txt
=====================================
@@ -25,13 +25,12 @@ piuparts-master and piuparts-slaves packages as described in
 :blue:`Installation`
 ^^^^^^^^^^^^^^^^^^^^
 
-piuparts.debian.org is a setup running on three systems:
+piuparts.debian.org is a setup running on two systems:
 
 * pejacevic.debian.org, running the piuparts-master instance and an apache
   webserver to display the results.
-* piu-slave-bm-a.debian.org, running four piuparts-slave nodes to run the
+* piu-slave-ubc-01.debian.org, running four piuparts-slave nodes to run the
   actual tests.
-* piu-slave-ubc-01.debian.org, running four piuparts-slave nodes as well.
 
 
 :blue:`piuparts installation from source`
@@ -59,7 +58,7 @@ piuparts.debian.org is a setup running on three systems:
 ^^^^^^^^^^^^^^^^^^
 
 On pejacevic the piuparts-master user piupartsm needs to be created, on
-piu-slave-bm-a and piu-slave-ubc-01 a piupartss user is needed for the slave.
+piu-slave-ubc-01 a piupartss user is needed for the slave.
 Both are members of the group piuparts and '/srv/piuparts.debian.org' needs to
 be chmod 2775 and chown piuparts(sm):piuparts.
 
@@ -99,7 +98,7 @@ with ssh and run only piuparts-master. Restrict it like this:::
 
 This is actually done by DSA:
 
- '/etc/sudoers' for piu-slave-bm-a and piu-slave-ubc-01:
+ '/etc/sudoers' for piu-slave-ubc-01:
 
 .. code-block:: text
 
@@ -150,9 +149,9 @@ Updating the master, pejacevic.debian.org:::
  holger at pejacevic~$ sudo su - piupartsm update-piuparts-master-setup develop origin
 
 
-Updating the slave(s), for example on piu-slave-bm-a.debian.org:::
+Updating the slave(s), for example on piu-slave-ubc-01.debian.org:::
 
- holger at piu-slave-bm-a~$ sudo su - piupartss update-piuparts-slave-setup develop origin
+ holger at piu-slave-ubc-01~$ sudo su - piupartss update-piuparts-slave-setup develop origin
 
 
 :ref:`top <top3>`
@@ -173,7 +172,7 @@ Run the following script under *your* user account to start four instances of
 piuparts-slave on pejacevic, piuparts-master will be started automatically by
 the slaves.::
 
- holger at piu-slave-bm-a:~$ sudo -u piupartss -i slave_run
+ holger at piu-slave-ubc-01:~$ sudo -u piupartss -i slave_run
 
 
 There are several cronjobs installed via '~piupartsm/crontab' and


=====================================
htdocs/index.tpl
=====================================
@@ -43,14 +43,11 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      Since 2005 piuparts is run systematically on all packages in Debian, at first only on <a href="/sid" target="_blank">unstable</a>. Today piuparts.debian.org is testing many suites by running piuparts in <a href="/doc/README_server.html" target="_blank">master/slave mode</a>. This setup currently consists of three hosts: <a href="https://db.debian.org/machines.cgi?host=pejacevic" target="_blank">pejacevic.debian.org</a> and <a href="https://db.debian.org/machines.cgi?host=piu-slave-bm-a" target="_blank">piu-slave-bm-a.debian.org</a> and <a href="https://db.debian.org/machines.cgi?host=piu-slave-ubc-01" target="_blank">piu-slave-ubc-01.debian.org</a>:
+      Since 2005 piuparts is run systematically on all packages in Debian, at first only on <a href="/sid" target="_blank">unstable</a>. Today piuparts.debian.org is testing many suites by running piuparts in <a href="/doc/README_server.html" target="_blank">master/slave mode</a>. This setup currently consists of two hosts: <a href="https://db.debian.org/machines.cgi?host=pejacevic" target="_blank">pejacevic.debian.org</a> and and <a href="https://db.debian.org/machines.cgi?host=piu-slave-ubc-01" target="_blank">piu-slave-ubc-01.debian.org</a>:
      <ul>
       <li> pejacevic acts as the piuparts-master, which is responsible for scheduling test jobs to the slaves. The other main task is to generate the reports which are served via https://piuparts.debian.org.</li>
-      <li> piu-slave-bm-a runs four piuparts-slave instances, which then run piuparts itself.</li>
-      <li> piu-slave-ubc-01 also runs four piuparts-slave instances.</li>
+      <li> piu-slave-ubc-01 runs four piuparts-slave instances, which then run piuparts itself.</li>
      </ul>
-      The first two of these hosts run as virtualized hardware on <a href="http://bits.debian.org/2013/04/bytemark-donation.html" target="_blank">a nice cluster</a> hosted at <a href="http://www.bytemark.co.uk" target="_blank">Bytemark</a> and the last one runs virtualised at the University of British Columbia.
-     </td>
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">


=====================================
instances/Makefile
=====================================
@@ -6,7 +6,6 @@ MIRROR_piu-slave-1und1-01	 = http://mirror.1und1.de/debian/
 MIRROR_piu-slave-ubc-01		 = http://mirror-ubc.debian.org/debian/
 
 GENCONF		 = piuparts.conf.pejacevic
-GENCONF		+= piuparts.conf.piu-slave-bm-a
 GENCONF		+= piuparts.conf.piu-slave-1und1-01
 GENCONF		+= piuparts.conf.piu-slave-ubc-01
 


=====================================
instances/piuparts.conf-header.pejacevic
=====================================
@@ -1,7 +1,7 @@
 #
 # This is the configuration file for piuparts running in master-slave mode on
 # - pejacevic.debian.org (as master) and
-# - piu-slave-bm-a.debian.org (as slave).
+# - piu-slave-ubc-01.debian.org (as slave).
 #
 # For more information on this setup see https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt
 #


=====================================
instances/piuparts.conf-header.piu-slave-1und1-01
=====================================
@@ -2,7 +2,7 @@
 # This is the configuration file for piuparts running in master-slave mode on
 # - piu-slave-1und1-01.debian.org (as slave).
 # Except for the architecture being tested and the mirror configuration
-# this file is identical to the one for pejacevic and piu-slave-bm-a.
+# this file is identical to the one for pejacevic and piu-slave-ubc-01.
 #
 # NOTE: However this slave does exist yet, as piuparts-master does not yet
 #	support multiple architectures…


=====================================
instances/piuparts.conf-header.piu-slave-bm-a deleted
=====================================
@@ -1 +0,0 @@
-piuparts.conf-header.pejacevic
\ No newline at end of file


=====================================
instances/piuparts.conf-header.piu-slave-ubc-01
=====================================
@@ -2,7 +2,7 @@
 # This is the configuration file for piuparts running in master-slave mode on
 # - piu-slave-ubc-01.debian.org (as slave).
 # Except for the mirror configuration this file is identical to the one
-# for pejacevic and piu-slave-bm-a.
+# for pejacevic and piu-slave-ubc-01.
 #
 # For more information on this setup see https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt
 #



View it on GitLab: https://salsa.debian.org/debian/piuparts/commit/c88b177f68b53226614924d271d05f6b096c3c32

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/commit/c88b177f68b53226614924d271d05f6b096c3c32
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20191229/0a6f0e74/attachment-0001.html>
