From c0ea34e5c1f901122af6385c6a14b7865f7e4755 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 25 May 2016 07:42:11 -0400 Subject: [PATCH 1/2] modify template for docker host setup --- xCAT-test/autotest/linux.conf.template | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template index 6dbfa6553..25bdaf241 100644 --- a/xCAT-test/autotest/linux.conf.template +++ b/xCAT-test/autotest/linux.conf.template @@ -80,6 +80,16 @@ MIGRATION1_VERSION=2.10 MIGRATION2_VERSION=2.11.1 LATEST_VERSION=2.12.1 #For migration cass End +#For docker host setup +DOCKERIMAGE=ubuntu +DOCKERCOMMAND=/bin/bash +DOCKERCONIP=10.4.27.100 +DOCKERHOSIP=10.4.27.10 +DOCKERMNXCAT=xcatmn +MYNET0VALUE=10.0.0.0/8 +DOCKERCN=host05c08 +DOCKERHOST=c910f04x27v09 +#docker host setup end [Custom] #commands run before test From e44b37d53c039ce64ec946d637a0001334cfe1c6 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Fri, 27 May 2016 08:53:44 -0400 Subject: [PATCH 2/2] add cases' variables --- xCAT-test/autotest/linux.conf.template | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template index 25bdaf241..c5db1c1d5 100644 --- a/xCAT-test/autotest/linux.conf.template +++ b/xCAT-test/autotest/linux.conf.template @@ -88,8 +88,26 @@ DOCKERHOSIP=10.4.27.10 DOCKERMNXCAT=xcatmn MYNET0VALUE=10.0.0.0/8 DOCKERCN=host05c08 -DOCKERHOST=c910f04x27v09 #docker host setup end +#For installnics start +INSTALLNICIP=10.2.2.27 +#End +#For image define start +STATELITE=rhels7.2-ppc64-statelite-compute +STATELESS=rhels7.2-ppc64-netboot-compute +#End +#For switch case start +range=10.4-5.24-25.1 +#End +#For ntp case start +extntpserversip=10.2.1.12 +DATE=2016 +#End +#For bmc test case start +bmcrange=10.4.30.254 +bmcusername=USERID +bmcpasswd=PASSW0RD +#End [Custom] #commands run before test