diff options
| author | Lars Wirzenius <liw@liw.fi> | 2013-04-06 11:44:11 +0100 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2013-04-06 11:44:11 +0100 |
| commit | 3a4c51c85a66e51377740f2057dfcaab9bf58482 (patch) | |
| tree | 6e9fbae2b4a5ddb7d64463e5dcd43c9653057a29 | |
| parent | e4526f0f0ba7e25b88d3fe7e60dc40e0f74ca6ac (diff) | |
| download | jenkinstool-3a4c51c85a66e51377740f2057dfcaab9bf58482.tar.gz | |
Fix stuff and start adding wheezy workers
| -rw-r--r-- | jenkinstool-real.conf | 2 | ||||
| -rw-r--r-- | liw-real.conf | 24 | ||||
| -rwxr-xr-x | vm-create | 8 | ||||
| -rwxr-xr-x | vm-data/worker.customize | 2 |
4 files changed, 28 insertions, 8 deletions
diff --git a/jenkinstool-real.conf b/jenkinstool-real.conf index 2838f2a..668b3ab 100644 --- a/jenkinstool-real.conf +++ b/jenkinstool-real.conf @@ -1,3 +1,3 @@ [config] log = foo.log -jenkins-host = 192.168.122.113 +jenkins-host = jenkins diff --git a/liw-real.conf b/liw-real.conf index 470a33d..98add9f 100644 --- a/liw-real.conf +++ b/liw-real.conf @@ -2,7 +2,7 @@ "hosts": [ { "name": "sid-amd64", - "ssh-target": "jenkins@192.168.122.227", + "ssh-target": "jenkins@jenkins-sid-amd64", "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub", "directory": "/tmp/workspace", "arch": "amd64", @@ -10,7 +10,23 @@ }, { "name": "sid-i386", - "ssh-target": "jenkins@192.168.122.128", + "ssh-target": "jenkins@jenkins-sid-i386", + "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub", + "directory": "/tmp/workspace", + "arch": "i386", + "debian-dist": "unstable" + }, + { + "name": "wheezy-amd64", + "ssh-target": "jenkins@jenkins-wheezy-amd64", + "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub", + "directory": "/tmp/workspace", + "arch": "amd64", + "debian-dist": "unstable" + }, + { + "name": "wheezy-i386", + "ssh-target": "jenkins@jenkins-wheezy-i386", "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub", "directory": "/tmp/workspace", "arch": "i386", @@ -18,7 +34,7 @@ }, { "name": "squeeze-amd64", - "ssh-target": "jenkins@192.168.122.187", + "ssh-target": "jenkins@jenkins-squeeze-amd64", "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub", "directory": "/tmp/workspace", "arch": "amd64", @@ -26,7 +42,7 @@ }, { "name": "squeeze-i386", - "ssh-target": "jenkins@192.168.122.28", + "ssh-target": "jenkins@jenkins-squeeze-i386", "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub", "directory": "/tmp/workspace", "arch": "i386", @@ -2,7 +2,7 @@ # # vm-create - create VM images to run Jenkins and workers # -# Copyright 2012 Lars Wirzenius +# Copyright 2012, 2013 Lars Wirzenius # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,7 +31,11 @@ do done # Create the images -for flavor in jenkins squeeze-amd64 squeeze-i386 sid-amd64 sid-i386 +for flavor in \ + jenkins \ + squeeze-amd64 squeeze-i386 \ + wheezy-amd64 wheezy-i386 \ + sid-amd64 sid-i386 do conf="vm-data/$flavor.conf" img=$(awk '$1 ~ /^image[:=]?/ { print $NF }' "$conf") diff --git a/vm-data/worker.customize b/vm-data/worker.customize index 8053025..546af18 100755 --- a/vm-data/worker.customize +++ b/vm-data/worker.customize @@ -48,7 +48,7 @@ install -m 0644 vm-data/worker.user-key.pub \ # Install an authorized_keys files to allow jenkins on the master node, # and on the worker itself, to log in with ssh. cat vm-data/jenkins.user-key.pub vm-data/worker.user-key.pub \ - "$rootdir/var/lib/jenkins/.ssh/authorized_keys" + > "$rootdir/var/lib/jenkins/.ssh/authorized_keys" chmod 0600 "$rootdir/var/lib/jenkins/.ssh/authorized_keys" # Disable ssh host key checking. |