aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-11 18:33:25 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-11 18:33:25 +0000
commit7a6c61c9c7faeee99c7c6018ad2747b96b05de67 (patch)
treedaa5d4ef397b4c3840b3cbb9a53853a21b428a56
parent5c08f350ac869d4533c5852b44a37f893a8558fd (diff)
downloadpuppet-7a6c61c9c7faeee99c7c6018ad2747b96b05de67.tar
puppet-7a6c61c9c7faeee99c7c6018ad2747b96b05de67.tar.gz
puppet-7a6c61c9c7faeee99c7c6018ad2747b96b05de67.tar.bz2
puppet-7a6c61c9c7faeee99c7c6018ad2747b96b05de67.tar.xz
puppet-7a6c61c9c7faeee99c7c6018ad2747b96b05de67.zip
buildsystem: remove iurt2010.1 and sync2010.1 scripts
The scripts were used when the build system servers were still running Mandriva 2010.1. But the servers have now been upgraded to Mageia, and the infra_* repositories created, so those scripts are no longer in use.
-rw-r--r--deployment/mga_buildsystem/manifests/mainnode.pp1
-rw-r--r--modules/buildsystem/manifests/init.pp16
-rwxr-xr-xmodules/buildsystem/templates/iurt2010.18
-rw-r--r--modules/buildsystem/templates/sync2010.120
4 files changed, 0 insertions, 45 deletions
diff --git a/deployment/mga_buildsystem/manifests/mainnode.pp b/deployment/mga_buildsystem/manifests/mainnode.pp
index 87986b7b..571b103d 100644
--- a/deployment/mga_buildsystem/manifests/mainnode.pp
+++ b/deployment/mga_buildsystem/manifests/mainnode.pp
@@ -1,7 +1,6 @@
class mga_buildsystem::mainnode {
include mga_buildsystem::config
include buildsystem::mainnode
- include buildsystem::sync20101
include buildsystem::release
include buildsystem::maintdb
include buildsystem::binrepo
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index 65b38b62..f15b5dbf 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -1,18 +1,2 @@
class buildsystem {
- # A script to copy on valstar the 2010.1 rpms built on jonund
- class sync20101 inherits base {
- $build_login = $buildsystem::iurt::user::login
- # TODO user iurt::user::homedir too
- mga-common::local_script { 'sync2010.1':
- content => template('buildsystem/sync2010.1'),
- }
- }
-
- # a script to build 2010.1 packages. used on jonund
- class iurt20101 inherits base {
- $build_login = $buildsystem::iurt::user::login
- mga-common::local_script { 'iurt2010.1':
- content => template('buildsystem/iurt2010.1'),
- }
- }
}
diff --git a/modules/buildsystem/templates/iurt2010.1 b/modules/buildsystem/templates/iurt2010.1
deleted file mode 100755
index 44633e9b..00000000
--- a/modules/buildsystem/templates/iurt2010.1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if [ `whoami` != <%= build_login %> ]
-then
- echo 'this script should be run as <%= build_login %>' >&2
- exit 1
-fi
-ARCH=$(rpm --eval %_target_cpu)
-iurt --chrooted-urpmi -m contrib/release main/release ../../../2010.1-mgaserv/$ARCH -- http://repository.<%= domain %>/mandriva/ -r mandriva2010.1 $ARCH $@
diff --git a/modules/buildsystem/templates/sync2010.1 b/modules/buildsystem/templates/sync2010.1
deleted file mode 100644
index 5f8eeebf..00000000
--- a/modules/buildsystem/templates/sync2010.1
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ `whoami` != <%= sched_login %> ]
-then
- echo 'this script should be run as <%= sched_login %>' >&2
- exit 1
-fi
-
-cd /distrib/mandriva/2010.1-mgaserv || exit 1
-rsync -avH <%= build_login %>@jonund:/home/iurt/2010.1-SRPMS/ ./SRPMS
-
-for i in i586 x86_64; do
- mkdir -p $i
- cd $i
- rsync -avH <%= build_login %>@jonund:/home/iurt/iurt/mandriva2010.1/$i/*.rpm .
- ssh <%= build_login %>@jonund rm -f '/home/iurt/iurt/mandriva2010.1/$i/*.rpm'
- genhdlist2 .
- cd ..
-done
-