From mboxrd@z Thu Jan 1 00:00:00 1970 From: "longtao.pang" Subject: [OSSTEST Nested PATCH v9 9/9] Add test job for nest test case Date: Sat, 2 May 2015 14:28:18 +0800 Message-ID: <1430548098-5233-10-git-send-email-longtaox.pang@intel.com> References: <1430548098-5233-1-git-send-email-longtaox.pang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1430548098-5233-1-git-send-email-longtaox.pang@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: wei.liu2@citrix.com, longtaox.pang@intel.com, Ian.Jackson@eu.citrix.com, Ian.Campbell@citrix.com, robert.hu@intel.com List-Id: xen-devel@lists.xenproject.org From: "longtao.pang" 1. This patch adds creation of the nested test job, when job creation procedure is invoked. 2. Set nested L1's vif model, nestedhvm feature, set specific disk size and memory size for nested test by make-flight. Signed-off-by: longtao.pang --- Changes in v9: 1. Group 'nestedl1*' and 'nestedl2*' together in the list. 2. Remove duplicated runvars for nested job. 3. Avoid testing Xen branches before 4.4; Avoid flights of qemu traditional (i.e. qemu upstream supported only). --- make-flight | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/make-flight b/make-flight index cc8ecdb..b5c7c27 100755 --- a/make-flight +++ b/make-flight @@ -204,6 +204,37 @@ do_hvm_win7_x64_tests () { all_hostflags=$most_hostflags,hvm } +do_hvm_debian_nested_tests () { + if [ $xenarch != amd64 -o $dom0arch != amd64 \ + -o "x$qemuu_suffix" != "x-qemuu" ]; then + return + fi + + case $xenbranch in + xen-3.*-testing) return;; + xen-4.0-testing) return;; + xen-4.1-testing) return;; + xen-4.2-testing) return;; + xen-4.3-testing) return;; + esac + # Define bios type, in 'ts-debian-hvm-install' script will use it, + # or will die if "$r{bios}" undefined. + bios=$1 + + job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-nested \ + test-nested xl $xenarch $dom0arch $qemuu_runvar \ + nestedl1_image=debian-7.2.0-amd64-CD-1.iso \ + nestedl1_vifmodel='e1000' \ + nestedl1_disksize='15000' \ + nestedl1_memsize='3072' \ + nestedl1_enable_nestedhvm='true' \ + nestedl1_guest_storage_size='20000' \ + nestedl2_image=debian-7.2.0-amd64-CD-1.iso \ + nestedl2_disksize='15000' \ + bios=$bios + all_hostflags=$most_hostflags,hvm +} + do_hvm_debian_test_one () { testname=$1 bios=$2 @@ -408,6 +439,7 @@ test_matrix_do_one () { do_hvm_rhel6_tests do_hvm_debian_tests + do_hvm_debian_nested_tests seabios done # qemuu_suffix -- 1.7.10.4