The new fedora buildslave machine uses fedora 21. The hostname of the machine has also changed.
Signed-off-by: Bhimanavajjula Aditya <[email protected]> --- etc/roles.conf | 4 +-- .../files/srv/buildbot/masters/ganeti/master.cfg | 6 ++-- .../buildbot/masters/ganeti/qa-vcluster-tiny.json | 2 +- .../buildslave/files.fedora18-64/etc/rc.d/rc.local | 6 ---- .../files.fedora18-64/etc/selinux/config | 11 ------ .../slaves/unittests-fedora18-64/buildbot.tac | 41 ---------------------- .../slaves/unittests-fedora18-64/info/admin | 1 - .../slaves/unittests-fedora18-64/info/host | 1 - .../buildslave/files.fedora21-64/etc/rc.d/rc.local | 6 ++++ .../files.fedora21-64/etc/selinux/config | 11 ++++++ .../slaves/unittests-fedora18-64/buildbot.tac | 41 ++++++++++++++++++++++ .../slaves/unittests-fedora18-64/info/admin | 1 + .../slaves/unittests-fedora18-64/info/host | 1 + 13 files changed, 66 insertions(+), 66 deletions(-) delete mode 100755 roles/buildslave/files.fedora18-64/etc/rc.d/rc.local delete mode 100644 roles/buildslave/files.fedora18-64/etc/selinux/config delete mode 100644 roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac delete mode 100644 roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin delete mode 100644 roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/host create mode 100755 roles/buildslave/files.fedora21-64/etc/rc.d/rc.local create mode 100644 roles/buildslave/files.fedora21-64/etc/selinux/config create mode 100644 roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac create mode 100644 roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin create mode 100644 roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/host diff --git a/etc/roles.conf b/etc/roles.conf index 6e3fd02..e8d170e 100644 --- a/etc/roles.conf +++ b/etc/roles.conf @@ -1,9 +1,9 @@ snf-13819: buildmaster snf-14476: buildslave.wheezy64 snf-472938: buildslave.jessie64 -snf-69083: buildslave.fedora18-64 +snf-689664: buildslave.fedora21-64 snf-68991: buildslave.ubuntu1304-64 -snf-69749: buildqa.fedora18-64 +snf-689686: buildqa.fedora21-64 snf-192771: buildqa.wheezy64-kvm snf-192805: buildqa.wheezy64-kvm snf-192809: buildqa.wheezy64-kvm diff --git a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg index 4d4715f..bca46eb 100644 --- a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg +++ b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg @@ -421,7 +421,7 @@ slavepass = open("pass").read().strip() test_slaves = [ "wheezy64", "jessie64", - "fedora18-64", + "fedora21-64", "ubuntu1304-64", ] @@ -536,7 +536,7 @@ def _QaBuild(ssh_service, checkout_mode, make_check): QA_VCLUSTER_MACHINES = [ - "snf-69749.vm.okeanos.grnet.gr", + "snf-689686.vm.okeanos.grnet.gr", ] QA_VCLUSTER_NET_PREFIX = "192.0.2" QA_VCLUSTER_MIP = "%s.1" % (QA_VCLUSTER_NET_PREFIX, ) @@ -624,7 +624,7 @@ def StepsForQA(name_prefix, machines, master_ip, master_netdev, mode, # QA runner for virtual cluster QA_RUNNERS = [ - ("bot-fedora18-64", "qa-vcluster", + ("bot-fedora21-64", "qa-vcluster", QA_VCLUSTER_MACHINES, QA_VCLUSTER_MIP, QA_VCLUSTER_MND, True, [QA_TINY], "sshd"), ("bot-wheezy64", "qa-kvm", QA_KVM_MACHINES, QA_KVM_MIP, QA_KVM_MND, False, [QA_TINY], "ssh"), diff --git a/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json b/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json index e9fd035..7fe1bb2 100644 --- a/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json +++ b/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json @@ -3,7 +3,7 @@ "#rename": "disabled", "# Virtual cluster": null, - "vcluster-master": "snf-69749.vm.okeanos.grnet.gr", + "vcluster-master": "snf-689686.vm.okeanos.grnet.gr", "vcluster-basedir": "/srv/ganeti/vcluster", "cluster-init-args": ["--no-etc-hosts", "--no-drbd-storage"], diff --git a/roles/buildslave/files.fedora18-64/etc/rc.d/rc.local b/roles/buildslave/files.fedora18-64/etc/rc.d/rc.local deleted file mode 100755 index 4729e45..0000000 --- a/roles/buildslave/files.fedora18-64/etc/rc.d/rc.local +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -su - buildbot -s /bin/sh \ - -c "cd /srv/buildbot/slaves/unittests-fedora18-64 && buildslave start -q" - -exit 0 diff --git a/roles/buildslave/files.fedora18-64/etc/selinux/config b/roles/buildslave/files.fedora18-64/etc/selinux/config deleted file mode 100644 index 4750ad0..0000000 --- a/roles/buildslave/files.fedora18-64/etc/selinux/config +++ /dev/null @@ -1,11 +0,0 @@ -# This file controls the state of SELinux on the system. -# SELINUX= can take one of these three values: -# enforcing - SELinux security policy is enforced. -# permissive - SELinux prints warnings instead of enforcing. -# disabled - No SELinux policy is loaded. -SELINUX=disabled -# SELINUXTYPE= can take one of these two values: -# targeted - Targeted processes are protected, -# minimum - Modification of targeted policy. Only selected processes are protected. -# mls - Multi Level Security protection. -SELINUXTYPE=targeted diff --git a/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac b/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac deleted file mode 100644 index e3d68cd..0000000 --- a/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac +++ /dev/null @@ -1,41 +0,0 @@ - -import os - -from twisted.application import service -from buildslave.bot import BuildSlave - -basedir = r'/srv/buildbot/slaves/unittests-fedora18-64' -rotateLength = 10000000 -maxRotatedFiles = 10 - -# if this is a relocatable tac file, get the directory containing the TAC -if basedir == '.': - import os.path - basedir = os.path.abspath(os.path.dirname(__file__)) - -# note: this line is matched against to check that this is a buildslave -# directory; do not edit it. -application = service.Application('buildslave') - -try: - from twisted.python.logfile import LogFile - from twisted.python.log import ILogObserver, FileLogObserver - logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength, - maxRotatedFiles=maxRotatedFiles) - application.setComponent(ILogObserver, FileLogObserver(logfile).emit) -except ImportError: - # probably not yet twisted 8.2.0 and beyond, can't set log yet - pass - -buildmaster_host = 'snf-13819.vm.okeanos.grnet.gr' -port = 9989 -slavename = 'bot-fedora18-64' -passwd = open('pass').read().strip() -keepalive = 600 -usepty = 0 -umask = None -maxdelay = 300 - -s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir, - keepalive, usepty, umask=umask, maxdelay=maxdelay) -s.setServiceParent(application) diff --git a/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin b/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin deleted file mode 100644 index c01d15b..0000000 --- a/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin +++ /dev/null @@ -1 +0,0 @@ -Ganeti Development <[email protected]> diff --git a/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/host b/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/host deleted file mode 100644 index 7ffd2d9..0000000 --- a/roles/buildslave/files.fedora18-64/srv/buildbot/slaves/unittests-fedora18-64/info/host +++ /dev/null @@ -1 +0,0 @@ -Please put a description of this build host here diff --git a/roles/buildslave/files.fedora21-64/etc/rc.d/rc.local b/roles/buildslave/files.fedora21-64/etc/rc.d/rc.local new file mode 100755 index 0000000..4729e45 --- /dev/null +++ b/roles/buildslave/files.fedora21-64/etc/rc.d/rc.local @@ -0,0 +1,6 @@ +#!/bin/sh -e + +su - buildbot -s /bin/sh \ + -c "cd /srv/buildbot/slaves/unittests-fedora18-64 && buildslave start -q" + +exit 0 diff --git a/roles/buildslave/files.fedora21-64/etc/selinux/config b/roles/buildslave/files.fedora21-64/etc/selinux/config new file mode 100644 index 0000000..4750ad0 --- /dev/null +++ b/roles/buildslave/files.fedora21-64/etc/selinux/config @@ -0,0 +1,11 @@ +# This file controls the state of SELinux on the system. +# SELINUX= can take one of these three values: +# enforcing - SELinux security policy is enforced. +# permissive - SELinux prints warnings instead of enforcing. +# disabled - No SELinux policy is loaded. +SELINUX=disabled +# SELINUXTYPE= can take one of these two values: +# targeted - Targeted processes are protected, +# minimum - Modification of targeted policy. Only selected processes are protected. +# mls - Multi Level Security protection. +SELINUXTYPE=targeted diff --git a/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac b/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac new file mode 100644 index 0000000..cd3876c --- /dev/null +++ b/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/buildbot.tac @@ -0,0 +1,41 @@ + +import os + +from twisted.application import service +from buildslave.bot import BuildSlave + +basedir = r'/srv/buildbot/slaves/unittests-fedora21-64' +rotateLength = 10000000 +maxRotatedFiles = 10 + +# if this is a relocatable tac file, get the directory containing the TAC +if basedir == '.': + import os.path + basedir = os.path.abspath(os.path.dirname(__file__)) + +# note: this line is matched against to check that this is a buildslave +# directory; do not edit it. +application = service.Application('buildslave') + +try: + from twisted.python.logfile import LogFile + from twisted.python.log import ILogObserver, FileLogObserver + logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength, + maxRotatedFiles=maxRotatedFiles) + application.setComponent(ILogObserver, FileLogObserver(logfile).emit) +except ImportError: + # probably not yet twisted 8.2.0 and beyond, can't set log yet + pass + +buildmaster_host = 'snf-13819.vm.okeanos.grnet.gr' +port = 9989 +slavename = 'bot-fedora21-64' +passwd = open('pass').read().strip() +keepalive = 600 +usepty = 0 +umask = None +maxdelay = 300 + +s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir, + keepalive, usepty, umask=umask, maxdelay=maxdelay) +s.setServiceParent(application) diff --git a/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin b/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin new file mode 100644 index 0000000..c01d15b --- /dev/null +++ b/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/admin @@ -0,0 +1 @@ +Ganeti Development <[email protected]> diff --git a/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/host b/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/host new file mode 100644 index 0000000..7ffd2d9 --- /dev/null +++ b/roles/buildslave/files.fedora21-64/srv/buildbot/slaves/unittests-fedora18-64/info/host @@ -0,0 +1 @@ +Please put a description of this build host here -- 2.6.0.rc2.230.g3dd15c0
