[PATCH OSSTEST 0/2] (Re)Add production config for Cambridge instance

[PATCH OSSTEST 0/2] (Re)Add production config for Cambridge instance

[Ian Campbell]

Although it is no longer the production instance I'd like to be able
to use it for ad-hoc testing.

I don't think there are so many other osstest instances in the world
that we cannot tolerate having all of their configurations in the main
repo if that is desired by the owners of the instances.

(I don't know who else has such an instance, or I would CC them)

Ian.

[PATCH OSSTEST 1/2] (Re)Add production config for Cambridge instance

[Ian Campbell]

Although it is no longer the production instance I'd like to be able
to use it for ad-hoc testing.

Created with:
 $ cp production-config production-config-cambridge
 $ git diff origin/production origin-cam/incoming -- production-config | patch production-config-cambridge

Where origin is the new production colo, origin-cam is the old
instance and:
$ git rev-parse origin/production
dce745682f1e326a04519908f07c0d589bd0fc62
$ git rev-parse origin-cam/incoming
a623769cbac25ae716ff9d8251116f95e2ee2531

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 production-config-cambridge | 96 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 production-config-cambridge

diff --git a/production-config-cambridge b/production-config-cambridge
new file mode 100644
index 0000000..5fbca50
--- /dev/null
+++ b/production-config-cambridge
@@ -0,0 +1,96 @@
+
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2009-2013 Citrix Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+JobDB Executive
+HostDB Executive
+
+DnsDomain cam.xci-test.com
+NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
+
+Stash /home/xc_osstest/logs
+Images /home/xc_osstest/images
+Logs /home/xc_osstest/logs
+
+Results /home/xc_osstest/results
+PubBaseDir /home/xc_osstest
+
+OverlayLocal /export/home/osstest/overlay-local
+
+LogsMinSpaceMby= 10*1e3
+LogsMinExpireAge= 86400*4
+
+TestHostKeypairPath /export/home/osstest/.ssh/id_rsa_osstest
+
+GitCacheProxy git://drall.uk.xensource.com:9419/
+
+PubBaseUrl http://www.chiark.greenend.org.uk/~xensrcts
+ReportHtmlPubBaseUrl="$c{PubBaseUrl}/logs"
+ResultsHtmlPubBaseUrl="$c{PubBaseUrl}/results"
+
+Publish xensrcts@login.chiark.greenend.org.uk:/home/ian/work/xc_osstest
+GlobalLockDir /export/home/osstest/testing.git
+
+LogsPublish= "$c{Publish}/logs"
+ResultsPublish= "$c{Publish}/results"
+
+HarnessPublishGitUserHost xen@xenbits.xensource.com
+HarnessPublishGitRepoDir git/osstest.git
+
+ReportTrailer= <<END
+Logs, config files, etc. are available at
+    $c{ReportHtmlPubBaseUrl}
+
+Test harness code can be found at
+    http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary
+END
+
+PlanRogueAllocationDuration= 86400*7
+
+TftpPath /home/xc_tftpboot/pxe/
+TftpPlayDir osstest/
+TftpTmpDir osstest/tmp/
+TftpPxeDir /
+TftpPxeTemplates %ipaddrhex%/pxelinux.cfg
+
+TftpPxeGroup osstest
+TftpDiVersion 2015-01-10
+
+XenUsePath /usr/groups/xencore/systems/bin/xenuse
+XenUseUser osstest
+
+# We use the IP address because Citrix can't manage reliable nameservice
+#DebianMirrorHost debian.uk.xensource.com
+DebianMirrorHost 10.80.16.196
+
+HostProp_NtpServer ntp.uk.xensource.com
+
+DebianPreseed= <<'END'
+END
+
+HostProp_Serial sympathy woking
+HostProp_GenEtherPrefixBase 5a:36:0e:00
+#                                      :00:01 guest number in job appended
+#                                    ^^ xor'd with low 8 bits of flight
+
+AuthorizedKeysAppend= <<'END'
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq8eHHFJ+XHYgpHxfSdciq0b3tYPdMhHf9CgtwdKGSqCyDyocbn1jX6P0Z535K/JcVaxvaRQbGDl9FZ25neQw6lysE8pGf+G353mgLAE7Lw6xKqlTXDcR0GpKHiZUyY8Ck5AJlGF2MO0cDEzMBx+xkOahDBvAozikUcDHJsTNP+UUIGoRaPeQK0DfgprPkoaLzXFDiZvEoBtYcUUieuNygJt+QVM+ovyTXC68wg5Xb5Ou2PopmDaVMX6/A1HxziTWc3XdhOF5ocuRF/kfWpZL223Auuu/xvNQDly13DhuVlQiU3gRIP7BSCwCdsQC/K68Q6SgfBklKRiqHquYo/QyNQ== osstest@woking.xci-test.com
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs6FF9nfzWIlLPeYdqNteJBoYJAcgGxQgeNi7FHYDgWNFhoYPlMPXWOuXhgNxA2/vkX9tUMVZaAh+4WTL1iRBW5B/AS/Ek2O7uM2Uq8v68D2aU9/XalLVnIxssr84pewUmKW8hZfjNnRm99RTQ2Knr2BvtwcHqXtdGYdTYCJkel+FPYQ51yXGRU7dS0D59WapkDFU1tH1Y8s+dRZcRZNRJ5f1w/KO1zx1tOrZRkO3fPlEGNZHVUYfpZLPxz0VX8tOeoaOXhKZO8vSp1pD0L/uaD6FOmugMZxbtq9wEjhZciNCq61ynRf2yt2v9DMu4EAzbW/Ws7OBvWtYj/RHcSxKbw== iwj@woking.xci-test.com
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2m8+FRm8zaCy4+L2ZLsINt3OiRzDu82JE67b4Xyt3O0+IEyflPgw5zgGH69ypOn2GqYTaiBoiYNoAn9bpUksMk71q+co4gsZJ17Acm0256A3NP46ByT6z6/AKTl58vwwNKSCEAzNru53sXTYw2TcCZUN8A4vXY76OeJNJmCmgBDHCNod9fW6+EOn8ZSU1YjFUBV2UmS2ekKmsGNP5ecLAF1bZ8I13KpKUIDIY+UiG0UMwTWDfQY59SNsz6bCxv9NsxSXL29RS2XHFeIQis7t6hJuyZTT4b9YzjEAxvk8kdGzzK6314kwILibm1O1Y8LLyrYsWK1AvnJQFIhcYXF0EQ== iwj@mariner
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApAkFv1FwknjOoataWvq5SRN/eUHjfQ5gfWnGJpIa4qnT+zAqYuC10BAHu3pHPV6NiedMxud0KcYlu/giQBMVMnYBdb7gWKdK4AQTgxHgvMMWHufa8oTLONLRsvyp1wQADJBzjQSjmo6HHF9faUckZHfJTfRxqLuR/3ENIyl+CRV9G6KfN9fbABejBxdfsbuTHc5ew2JsYxhDJsDFHgMjtrUoHI/d6eBTQDx8GRj8uUor8W+riFpW3whTH9dqloOyrqIke2qGVQlMNmzx5Z04vB1+n95nu9c5SGOZTUT4BQ5FybEANWQsNfJ7b3aMcYgVCVkKuRHSbW8Q4Pyn1Nh31w== ian@liberator
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDY+wyHPeVjiqPzmKZxSxA0fxQ8r0zKMN1cYxJrryE68XzrocprAEqrGR8n3LN3JBApt4kf5gNn4DUdDo6BmCrnTuO4p43ydKJ2BDtWjQJAYdm0g5ttvF3C0A0wnog+jP3WZhTXu40LohKWO5a0If4/SBTkZvKBuSGV4v6wihbeA2Y2aEqwIlfvdSeq96jcbppNXlhWC4bB8VIVU1pa422nTQwpLdaD4qdLi31FEWSqPd2Ro/Z5i/w22M/5wvjYMkUXQcQIn6IsajM6BR56aBGgzIxWGwkxp7iQMPCCXJ4/wTpP1A5lU4k3B8FJCkM9nnSM2koPPr+HSnOKewBqwD1V iwj@osstest
+END
-- 
2.1.4

[PATCH OSSTEST 2/2] production-config*: Set HostnameSortSwapWords as appropriate

[Ian Campbell]

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 production-config           | 2 ++
 production-config-cambridge | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/production-config b/production-config
index cb68111..2ffefdd 100644
--- a/production-config
+++ b/production-config
@@ -19,6 +19,8 @@
 JobDB Executive
 HostDB Executive
 
+HostnameSortSwapWords 0
+
 HostDB_Executive_NoConfigDB 1
 Include /root/osstest-hosts-config
 
diff --git a/production-config-cambridge b/production-config-cambridge
index 5fbca50..ad4e44c 100644
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -19,6 +19,8 @@
 JobDB Executive
 HostDB Executive
 
+HostnameSortSwapWords 1
+
 DnsDomain cam.xci-test.com
 NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
 
-- 
2.1.4