summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2013-09-14 18:21:47 +0100
committerLars Wirzenius <liw@liw.fi>2013-09-14 18:21:47 +0100
commit7fbe0ef8a2c6850710f5eb8d9b8339c6f450d94f (patch)
tree1f4cff4476cf439b04b0b9a2c0b5a1c506fdaad0
parentfc6bbca3fd6595a6c10aeb1c88c2cc90d0eb75c8 (diff)
downloadjenkinstool-7fbe0ef8a2c6850710f5eb8d9b8339c6f450d94f.tar.gz
Remove squeeze support
-rwxr-xr-xdeploy-all2
-rwxr-xr-xfetch6
-rw-r--r--liw-real.conf16
-rwxr-xr-xvm-all2
-rwxr-xr-xvm-create1
-rw-r--r--vm-data/hosts2
-rw-r--r--vm-data/jenkins.conf2
7 files changed, 2 insertions, 29 deletions
diff --git a/deploy-all b/deploy-all
index f2f1107..5c39738 100755
--- a/deploy-all
+++ b/deploy-all
@@ -14,8 +14,6 @@ install_vm()
}
install_vm jenkins 512
-install_vm jenkins-squeeze-amd64 512
-install_vm jenkins-squeeze-i386 512
install_vm jenkins-wheezy-amd64 512
install_vm jenkins-wheezy-i386 512
install_vm jenkins-sid-amd64 512
diff --git a/fetch b/fetch
index b8967e3..6d20a09 100755
--- a/fetch
+++ b/fetch
@@ -26,11 +26,7 @@ for url in \
"${baseurl}.wheezy_source.changes" \
"${baseurl}.wheezy_all.changes" \
"${baseurl}.wheezy_i386.changes" \
- "${baseurl}.wheezy_amd64.changes" \
- "${baseurl}.squeeze_source.changes" \
- "${baseurl}.squeeze_all.changes" \
- "${baseurl}.squeeze_i386.changes" \
- "${baseurl}.squeeze_amd64.changes"
+ "${baseurl}.wheezy_amd64.changes"
do
if curl -s --head --fail "$url" | head -n1 | grep -q '^HTTP/1.1 200'
then
diff --git a/liw-real.conf b/liw-real.conf
index 9707766..7c23145 100644
--- a/liw-real.conf
+++ b/liw-real.conf
@@ -31,22 +31,6 @@
"directory": "/tmp/workspace",
"arch": "i386",
"debian-dist": "wheezy"
- },
- {
- "name": "squeeze-amd64",
- "ssh-target": "jenkins@jenkins-squeeze-amd64",
- "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub",
- "directory": "/tmp/workspace",
- "arch": "amd64",
- "debian-dist": "squeeze"
- },
- {
- "name": "squeeze-i386",
- "ssh-target": "jenkins@jenkins-squeeze-i386",
- "ssh-key": "/var/lib/jenkins/.ssh/id_rsa.pub",
- "directory": "/tmp/workspace",
- "arch": "i386",
- "debian-dist": "squeeze"
}
],
"projects": [
diff --git a/vm-all b/vm-all
index 819c437..19ec81f 100755
--- a/vm-all
+++ b/vm-all
@@ -4,8 +4,6 @@ set -eu
VMLIST="
jenkins
-jenkins-squeeze-amd64
-jenkins-squeeze-i386
jenkins-wheezy-amd64
jenkins-wheezy-i386
jenkins-sid-amd64
diff --git a/vm-create b/vm-create
index 994120f..8122ab0 100755
--- a/vm-create
+++ b/vm-create
@@ -33,7 +33,6 @@ done
# Create the images
for flavor in \
jenkins \
- squeeze-amd64 squeeze-i386 \
wheezy-amd64 wheezy-i386 \
sid-amd64 sid-i386
do
diff --git a/vm-data/hosts b/vm-data/hosts
index 24dcc28..b2496b2 100644
--- a/vm-data/hosts
+++ b/vm-data/hosts
@@ -8,8 +8,6 @@
192.168.122.5 jenkins
192.168.122.114 jenkins-sid-amd64
192.168.122.230 jenkins-sid-i386
-192.168.122.229 jenkins-squeeze-amd64
-192.168.122.236 jenkins-squeeze-i386
192.168.122.121 jenkins-wheezy-amd64
192.168.122.150 jenkins-wheezy-i386
diff --git a/vm-data/jenkins.conf b/vm-data/jenkins.conf
index 377185b..8233b04 100644
--- a/vm-data/jenkins.conf
+++ b/vm-data/jenkins.conf
@@ -1,5 +1,5 @@
[config]
-distribution = squeeze
+distribution = wheezy
hostname = jenkins
arch = amd64
image = jenkins.img