update notes for j.d.org migration

1 files changed, 17 insertions, 23 deletions

diff --git a/TODO b/TODO
index 0561630a..7d2fcf78 100644
--- a/TODO
+++ b/TODO
@@ -53,36 +53,30 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 
 ==== next steps for jenkins.d.o migration
 
-* weasel/h01ger: install jenkins.deb
-** also create jenkins users in jenkins (KISS)
-* h01ger: get slaves: wishlist for starting: 3 slaves, 8 cores, 32gb ram, 150gb hd space if we dont need squid3 on them, 200gb if we do.
-** install slaves - how (to automate)?
-* install jenkins-job-builder
-** needs proper package
-* ... (to be planned, see below)
-* update DNS to point jenkins.d.o to jerea.d.o
-* ... (to be planned, see below)
+* h01ger: sit down with weasel at cccamp or debconf and document current state and discuss next steps
+** probably do (at least) the 2nd step at debconf so others can participate
+* old plan:
+** weasel/h01ger: install jenkins.deb from jenkins-ci.org
+*** also create jenkins users in jenkins (KISS)
+** h01ger: get slaves: wishlist for starting: 3 slaves, 8 cores, 32gb ram, 150gb hd space if we dont need squid3 on them, 200gb if we do.
+*** install slaves - how (to automate)?
+** install jenkins-job-builder "somehow", currently "only" a package from fil exists (but needs build-depends not yet even in sid atm)
+** update DNS to point jenkins.d.o to jerea.d.o
+*** the existing jenkins.d.o host needs to be renamed to something else (thats "just work" to do but not a major obstacle)
 
 ==== unsorted notes for jenkins.d.o migration
 
-* chroot jobs should use real schroot sessions, and not just use schroot as poor chroot(8) replacement. some links:
-** https://anonscm.debian.org/cgit/mirror/dsa-puppet.git/tree/modules/schroot
-** https://anonscm.debian.org/cgit/mirror/dsa-puppet.git/tree/modules/porterbox/files/dd-schroot-cmd
-** https://gitweb.torproject.org/project/jenkins/tools.git/tree/slaves/linux/build-wrapper
 * sudoers.d/jenkins:
 ** not suitable for jenkins.d.o, thus we will run all tests on slaves, where DSA doesnt care what we do
-* upgrade to jessie, software used which is not in jessie / available as jenkins plugin:
-** jenkins.deb
-*** DSA prefers if we could use jenkins from jessie-backports
-*** 2nd option: own repo, only contains jenkins.deb
-*** 3rd option: use upstreams repo
-** jenkins-job-builder probably needs to be more properly packaged
-*** could be installed locally in jenkins home
-** livescreenshot plugin (we use a patched version)
-*** jenkins maintaince probably is best done by jenkins users (as opposed to DSA) so that's up to us
+* livescreenshot plugin (we use a patched version) is ok:
+** jenkins maintenance probably is best done by jenkins users (as opposed to DSA) so it's up to us what plugins we install
 * munin monitoring of the slaves
 ** DSA munin configuration is auto generated by puppet, so the slaves should become .d.o hosts too, to be included
-* the existing jenkins.d.o host needs to be renamed to something else (thats "just work" to do but not a major obstacle)
+** or install another munin instance, just to monitor the slaves, on jenkins itself
+* chroot jobs should use real schroot sessions, and not just use schroot as poor chroot(8) replacement. some links:
+** https://anonscm.debian.org/cgit/mirror/dsa-puppet.git/tree/modules/schroot
+** https://anonscm.debian.org/cgit/mirror/dsa-puppet.git/tree/modules/porterbox/files/dd-schroot-cmd
+** https://gitweb.torproject.org/project/jenkins/tools.git/tree/slaves/linux/build-wrapper
 
 === To be done once jenkins.d.n runs jessie