From patchwork Fri Jan 15 20:22:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 73214 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0FKMVhe018631 for ; Fri, 15 Jan 2010 20:22:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758216Ab0AOUW3 (ORCPT ); Fri, 15 Jan 2010 15:22:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758215Ab0AOUW3 (ORCPT ); Fri, 15 Jan 2010 15:22:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44902 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758211Ab0AOUW2 (ORCPT ); Fri, 15 Jan 2010 15:22:28 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0FKMSNj026607 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Jan 2010 15:22:28 -0500 Received: from localhost.localdomain (vpn-9-106.rdu.redhat.com [10.11.9.106]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0FKMMLn005065; Fri, 15 Jan 2010 15:22:26 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, mgoldish@redhat.com, Lucas Meneghel Rodrigues Subject: [PATCH 2/2] Fix windows unattended setup for rss.exe Date: Fri, 15 Jan 2010 18:22:19 -0200 Message-Id: <1263586939-19464-2-git-send-email-lmr@redhat.com> In-Reply-To: <1263586939-19464-1-git-send-email-lmr@redhat.com> References: <1263586939-19464-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 1942bc0..a63cc52 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -602,6 +602,7 @@ variants: unattended_install: timeout = 7200 finish_program = deps/finish.exe + cdrom_extra = windows/winutils.iso migrate: migration_test_command = ver && vol migration_bg_command = start ping -t localhost diff --git a/client/tests/kvm/unattended/win2003-32.sif b/client/tests/kvm/unattended/win2003-32.sif index 374d4c4..57cf9c2 100644 --- a/client/tests/kvm/unattended/win2003-32.sif +++ b/client/tests/kvm/unattended/win2003-32.sif @@ -56,7 +56,8 @@ Mode = 0 local="Local Area Connection" [GuiRunOnce] -Command0="sc config TlntSvr start= auto" -Command1="netsh firewall set opmode disable" -Command2="net start telnet" -Command3="cmd /c netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" +Command0="cmd /c sc config TlntSvr start= auto" +Command1="cmd /c netsh firewall set opmode disable" +Command2="cmd /c net start telnet" +Command3="cmd /c E:\setuprss.bat" +Command4="cmd /c netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" diff --git a/client/tests/kvm/unattended/win2003-64.sif b/client/tests/kvm/unattended/win2003-64.sif index fe468cb..aca24fe 100644 --- a/client/tests/kvm/unattended/win2003-64.sif +++ b/client/tests/kvm/unattended/win2003-64.sif @@ -58,4 +58,5 @@ local="Local Area Connection" Command0="cmd /c sc config TlntSvr start= auto" Command1="cmd /c netsh firewall set opmode disable" Command2="cmd /c net start telnet" -Command3="cmd /c netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" +Command3="cmd /c E:\setuprss.bat" +Command4="cmd /c netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml index b8f3a56..0498e99 100644 --- a/client/tests/kvm/unattended/win2008-32-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml @@ -113,6 +113,10 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/win2008-64-autounattend.xml b/client/tests/kvm/unattended/win2008-64-autounattend.xml index 345165a..77c4999 100644 --- a/client/tests/kvm/unattended/win2008-64-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-64-autounattend.xml @@ -120,14 +120,18 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 true - Work - 1 - true + Work + 1 + true true diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml index 345165a..77c4999 100644 --- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml @@ -120,14 +120,18 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 true - Work - 1 - true + Work + 1 + true true diff --git a/client/tests/kvm/unattended/win7-32-autounattend.xml b/client/tests/kvm/unattended/win7-32-autounattend.xml index faf588a..27cd3b0 100644 --- a/client/tests/kvm/unattended/win7-32-autounattend.xml +++ b/client/tests/kvm/unattended/win7-32-autounattend.xml @@ -58,7 +58,7 @@ true redhatqe - redhat + redhat false true @@ -113,6 +113,10 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/win7-64-autounattend.xml b/client/tests/kvm/unattended/win7-64-autounattend.xml index 345165a..77c4999 100644 --- a/client/tests/kvm/unattended/win7-64-autounattend.xml +++ b/client/tests/kvm/unattended/win7-64-autounattend.xml @@ -120,14 +120,18 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 true - Work - 1 - true + Work + 1 + true true diff --git a/client/tests/kvm/unattended/winvista-32-autounattend.xml b/client/tests/kvm/unattended/winvista-32-autounattend.xml index 054926d..47ecb95 100644 --- a/client/tests/kvm/unattended/winvista-32-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-32-autounattend.xml @@ -126,9 +126,13 @@ 4 - %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 + %WINDIR%\System32\cmd /c E:\setuprss.bat 5 + + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 + 6 +