diff mbox

[OSSTEST,01/16] XXX add a stretch config based on production-config

Message ID 20171020103840.32762-2-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu Oct. 20, 2017, 10:38 a.m. UTC

Comments

Ian Jackson Oct. 20, 2017, 10:54 a.m. UTC | #1
Wei Liu writes ("[OSSTEST PATCH 01/16] XXX add a stretch config based on production-config"):
> diff -ub production-config production-config-stretch

The changes LGTM but obviously this ought to go straight into
`production-config'.

Ian.
Wei Liu Oct. 20, 2017, 11:17 a.m. UTC | #2
On Fri, Oct 20, 2017 at 11:54:44AM +0100, Ian Jackson wrote:
> Wei Liu writes ("[OSSTEST PATCH 01/16] XXX add a stretch config based on production-config"):
> > diff -ub production-config production-config-stretch
> 
> The changes LGTM but obviously this ought to go straight into
> `production-config'.

I kept two files so that I can switch easily between them.

The final incarnation of this patch is going to be a bit different -- I
want to patch Osstest.pm to switch the default suite.
diff mbox

Patch

diff -ub production-config production-config-stretch

--- production-config   2017-10-11 15:01:16.891770210 +0100
+++ production-config-stretch   2017-10-19 16:12:20.839743993 +0100
@@ -21,6 +21,9 @@ 
 JobDB Executive
 HostDB Executive

+DebianSuite stretch
+GuestDebianSuite stretch
+
 HostnameSortSwapWords 0

 HostDB_Executive_NoConfigDB 1
@@ -93,10 +96,12 @@ 
 # Update with ./mg-debian-installer-update(-all)
 TftpDiVersion_wheezy 2016-06-08
 TftpDiVersion_jessie 2017-04-06
+TftpDiVersion_stretch 2017-10-11

 # For ISO installs
 DebianImageVersion_wheezy 7.2.0
 DebianImageVersion_jessie 8.2.0
+DebianImageVersion_stretch 9.2.1

 # These should normally be the same.
 # Update with ./mg-cpu-microcode-update
---
 production-config-stretch | 173 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)
 create mode 100644 production-config-stretch

diff --git a/production-config-stretch b/production-config-stretch
new file mode 100644
index 0000000..5d48bfd
--- /dev/null
+++ b/production-config-stretch
@@ -0,0 +1,173 @@ 
+
+# 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/>.
+
+# This is the master instance, therefore it has no upstream
+OsstestUpstream= ''
+
+JobDB Executive
+HostDB Executive
+
+DebianSuite stretch
+GuestDebianSuite stretch
+
+HostnameSortSwapWords 0
+
+HostDB_Executive_NoConfigDB 1
+Include /root/osstest-hosts-config
+
+DnsDomain test-lab.xenproject.org
+NetNameservers 172.16.144.4
+
+OwnerDaemonHost db
+QueueDaemonHost osstest
+
+ExecutiveDbnamePat dbname=osstestdb;host=db
+
+Images /home/logs/images
+
+PubBaseDir /home/logs
+
+OverlayLocal /home/osstest/overlay-local
+
+LogsMinSpaceMby= 10*1e3
+LogsMinExpireAge= 86400*4
+LogsPublishMinSpaceMby= 10*1e3
+LogsPublishMinExpireAge= 86400*7
+
+TestHostKeypairPath /home/osstest/.ssh/id_rsa_osstest
+
+GitCacheProxy git://cache:9419/
+
+HttpProxy http://cache:3128/
+
+PubBaseUrl http://logs.test-lab.xenproject.org/osstest
+ReportHtmlPubBaseUrl="$c{PubBaseUrl}/logs"
+ResultsHtmlPubBaseUrl="$c{PubBaseUrl}/results"
+ReportHtmlUnpubBaseUrl="http://osstest/~osstest/pub/logs/"
+
+Publish osstest@www:/var/www/osstest
+GlobalLockDir /home/osstest/testing.git
+
+LogsPublish= "$c{Publish}/logs"
+ResultsPublish= "$c{Publish}/results"
+
+HarnessPublishGitUserHost osstest@xenbits.xen.org
+HarnessPublishGitRepoDir ext/osstest-massachusetts.git
+
+ReportTrailer= <<END
+Logs, config files, etc. are available at
+    $c{ReportHtmlPubBaseUrl}
+
+Explanation of these reports, and of osstest in general, is at
+    http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README.email;hb=master
+    http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README;hb=master
+
+Test harness code can be found at
+    http://xenbits.xen.org/gitweb?p=osstest.git;a=summary
+END
+
+PlanRogueAllocationDuration= 86400*7
+
+TftpPath /home/tftp/
+TftpPlayDir osstest/
+TftpTmpDir osstest/tmp/
+TftpPxeDir /
+TftpPxeTemplates %name%/pxelinux.cfg
+TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex%
+TftpNetGrubDir /
+TftpNetGrubTemplates %name%/netgrub.cfg
+TftpNetGrubTemplatesReal Netgrub.cfg/%ether%
+
+TftpNetbootGroup osstest
+# Update with ./mg-debian-installer-update(-all)
+TftpDiVersion_wheezy 2016-06-08
+TftpDiVersion_jessie 2017-04-06
+TftpDiVersion_stretch 2017-10-11
+
+# For ISO installs
+DebianImageVersion_wheezy 7.2.0
+DebianImageVersion_jessie 8.2.0
+DebianImageVersion_stretch 9.2.1
+
+# These should normally be the same.
+# Update with ./mg-cpu-microcode-update
+MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio
+MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio
+
+# Update with ./mg-netgrub-loader-update
+TftpGrubVersion XXXX-XX-XX
+
+XenUsePath /usr/groups/xencore/systems/bin/xenuse
+XenUseUser osstest
+
+# Results might include potential vulnerabilities.
+CoverityEmail security@xen.org
+# This is only read from daily-cron-settings-real, everything else
+# gets the default/dummy path
+CoverityUploadUrl https://scan.coverity.com/builds?project=XenProject
+CoverityTools cov-analysis-linux64-2017.07.tar.gz
+CoverityToolsStripComponents 2
+
+# We use the IP address because Citrix can't manage reliable nameservice
+#DebianMirrorHost debian.uk.xensource.com
+#DebianMirrorHost 10.80.16.196
+DebianMirrorProxy http://cache:3143/
+
+HostProp_NtpServer infra.test-lab.xenproject.org
+
+DebianPreseed= <<'END'
+END
+
+HostProp_Serial sympathy serial0
+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
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxArew0DKa3mGEx73adSfaWowq0At3+QbA/LYh/lIw1Wn4YkgxXh2OS1/7NUjNu0IGjnHLelG+HHhUv1fH5JunNJj+GLRsU09dag8LVmbmX0fkebJg6a4iKSXREgoM7NcDn3lA5HXTiNq1Q0To7fb09tZ5wG2inaDvt8PMhVF+CsJXbfPGqJcnKyYosNMCIj6HVwvUl4UAyfyil3CfhklV8Dk1Wd626R93Q39TRrnV3Cm+xVSX2MEfY5mIaqYGeHSPhybqI/h6J6fVTRGNc2Y4oEwWd0ElZbRpCJ5OQx5oV4qMcCh4MSdOC5ZcSv1j3KLaehkwbLjKzpm4hf+2+bkRvua/4nMRWlDNG2C/k05Lt363OJkmUUR2DT+2Cf5P44WmhZeo3ekTN2Z19x8TGGU60UznbscPn/ri0F0bfAtLjlXgxG8W/L7i885uxTrETin6jrY/BBj7G/Fqu6ZffIQvhrww53vv3a/0VYYKBJ9c7HvTI0C5UugbV7oyHbT/2l0= ianc@osstest-ansible-generated
+
+END
+
+HttpsProxyMITMCert= <<'END'
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIJAKYOfDsTZAKAMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJNQTETMBEGA1UECgwKeGVucHJvamVjdDEZMBcGA1UE
+CwwQeGVucHJvamVjdF9zcXVpZDEmMCQGA1UEAwwdY2FjaGUudGVzdC1sYWIueGVu
+cHJvamVjdC5vcmcwHhcNMTcwMzA5MTI0NTI3WhcNMTkwMzA5MTI0NTI3WjByMQsw
+CQYDVQQGEwJVUzELMAkGA1UECAwCTUExEzARBgNVBAoMCnhlbnByb2plY3QxGTAX
+BgNVBAsMEHhlbnByb2plY3Rfc3F1aWQxJjAkBgNVBAMMHWNhY2hlLnRlc3QtbGFi
+LnhlbnByb2plY3Qub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+9WoZTo/f0bLYz+BAWGVt5f1Wycj05Mil3DU875Sql80giqU2b80rzwB60Puf/0Sp
+5kx8twY8QvR+JthLS4mfSddDq+W+ZwMbrEpp5E8Le+mdrw4YDkdu9bx47NrWOKqF
+z7Q+WONCq75YAWaa0b1Jp6fqQichNbkCdZY3hvemB7ZI+CFWuirOhzcqrZlS88qu
+iF9W0Oj+0O31ZThNVaINUqfrYO3xIbOwJl6qEcp/cAGvFr7ux3KiAg/Tc69xRn+U
+Heh4kbqOlkE8W5wn+0wiei0sEbgi9zxPVnu1XQY1LBh9zh7gbFt7X9ZKka7YlM4H
++IzRHcZl33kY2aVCNF4c6QIDAQABo1AwTjAdBgNVHQ4EFgQUpkoT3BVZ14oKu6qe
+Tt6aMvZ3sKEwHwYDVR0jBBgwFoAUpkoT3BVZ14oKu6qeTt6aMvZ3sKEwDAYDVR0T
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAgKYcfH8ykXgnXJVSv1U7carxV/O/
+Io76jrXi3NtqXSugadzakFEOgjkNAfeOrtmQRAF6JuFhPfhweWvnfYGXV/QrxF7N
+nkCVhvNTsyNM2WDeuBtzj/CBoyk0jBkwxdcG3SLEx/sHKPkTPziFuXcPvITdaP2a
+DC+NgIdL3FmEfzaabbDdrgGRt+/vfvu877atvrX1/B5/NOL+7mXaTR6jzuJRQeXK
+ftnS+ZW/GlbttfovPgFN/FjUioenfS9IS1IBwCJ4d9uHDbgOgL6uhEQ0Iq8Ou68f
+L6qOW4qBJldqxl9VX2RqcJExP0YwrvqmdsdC+xsTmXnOtpUkAYKNrvh7dg==
+-----END CERTIFICATE-----
+END