diff options
author | Bill Peck <bpeck@redhat.com> | 2013-01-29 16:21:24 -0500 |
---|---|---|
committer | Bill Peck <bpeck@redhat.com> | 2013-01-29 16:21:24 -0500 |
commit | 8e013b3ce000e04df9bf2589df81e86389892e25 (patch) | |
tree | f4eb7f8243dbb41de499a35701ba22ba6b985f6a /openvswitch-ovs2_4.xml | |
parent | 908afd40fb4e9a7612d744cca368862aa594a10b (diff) | |
download | tests-8e013b3ce000e04df9bf2589df81e86389892e25.tar.gz tests-8e013b3ce000e04df9bf2589df81e86389892e25.tar.xz tests-8e013b3ce000e04df9bf2589df81e86389892e25.zip |
remove all kickstart snippets. Do everything from tasks.
Diffstat (limited to 'openvswitch-ovs2_4.xml')
-rw-r--r-- | openvswitch-ovs2_4.xml | 428 |
1 files changed, 129 insertions, 299 deletions
diff --git a/openvswitch-ovs2_4.xml b/openvswitch-ovs2_4.xml index 63043d1..3a3ac50 100644 --- a/openvswitch-ovs2_4.xml +++ b/openvswitch-ovs2_4.xml @@ -4,7 +4,7 @@ </whiteboard> <recipeSet priority="High"> <recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_1 rhel6u4_2 rhel6u4_3"> - <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_1" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_1" role="None"> + <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_1" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_1" role="None"> <autopick random="false"/> <watchdog panic="None"/> <packages/> @@ -27,6 +27,11 @@ <task name="/distribution/install" role="STANDALONE"> <params/> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install netperf"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> @@ -36,34 +41,13 @@ <param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.1 NETMASK=255.255.255.0"/> </params> </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/> - <param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/> - <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/> - <param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/> - </params> - </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_u2" role="None"> + <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_u2" role="None"> <autopick random="false"/> <watchdog panic="None"/> <packages/> @@ -86,6 +70,11 @@ <task name="/distribution/install" role="STANDALONE"> <params/> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install netperf"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> @@ -95,34 +84,13 @@ <param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.2 NETMASK=255.255.255.0"/> </params> </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/> - <param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/> - <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/> - <param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/> - </params> - </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_3" role="None"> + <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_3" role="None"> <autopick random="false"/> <watchdog panic="None"/> <packages/> @@ -145,6 +113,11 @@ <task name="/distribution/install" role="STANDALONE"> <params/> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install netperf"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> @@ -154,27 +127,6 @@ <param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.3 NETMASK=255.255.255.0"/> </params> </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="INVALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/> - <param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="INVALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/> - <param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="INVALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/> - <param name="VALID_ADDRS" value="192.168.6.3 192.168.6.6"/> - </params> - </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -183,84 +135,7 @@ </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> - <packages/> - <ks_appends> - <ks_append><![CDATA[ -yum -y install openvswitch - -# Turn on openvswitch -chkconfig --add openvswitch - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge1 -DEVICE=ovsbridge1 -ONBOOT=yes -DEVICETYPE=ovs -TYPE=OVSBridge -HOTPLUG=no -OVSBOOTPROTO="static" -IPADDR=192.168.1.21 -NETMASK=255.255.255.0 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge2 -DEVICE=ovsbridge2 -ONBOOT=yes -DEVICETYPE=ovs -TYPE=OVSBridge -HOTPLUG=no -OVSBOOTPROTO="static" -IPADDR=192.168.2.21 -NETMASK=255.255.255.0 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge3 -DEVICE=ovsbridge3 -ONBOOT=yes -DEVICETYPE=ovs -TYPE=OVSBridge -HOTPLUG=no -OVSBOOTPROTO="static" -IPADDR=192.168.6.21 -NETMASK=255.255.255.0 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1 -DEVICE=p1p1 -HWADDR=00:10:18:E5:EA:5C -DEVICETYPE=ovs -TYPE=OVSPort -UUID=050742c1-1e01-4df2-83d0-04737a1c5bfa -ONBOOT=yes -NM_CONTROLLED=no -BOOTPROTO=none -OVS_BRIDGE=ovsbridge1 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1 -DEVICE=p2p1 -DEVICETYPE=ovs -TYPE=OVSPort -HWADDR=00:10:18:E8:7F:D0 -UUID=21522d02-db38-4ba5-9cc7-07fb589f83cd -ONBOOT=yes -BOOTPROTO=none -OVS_BRIDGE=ovsbridge2 -HOTPLUG=no -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -DEVICE=p6p1 -DEVICETYPE=ovs -TYPE=OVSPort -HWADDR=A0:36:9F:08:2B:C4 -UUID=9b17ffe0-d791-4ec2-92a4-6e96407feb60 -ONBOOT=yes -NM_CONTROLLED=no -BOOTPROTO=none -OVS_BRIDGE=ovsbridge3 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> <!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/">--> @@ -292,6 +167,23 @@ EOF <param name="KILLTIMEOVERRIDE" value="59280"/> </params> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install openvswitch; chkconfig --add openvswitch"/> + </params> + </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="ovsbridge1 ovsbridge2 ovsbridge3 p1p1 p2p1 p6p1"/> + <param name="ovsbridge1" value="DEVICE=ovsbridge1 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.1.21 NETMASK=255.255.255.0"/> + <param name="ovsbridge2" value="DEVICE=ovsbridge2 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.2.21 NETMASK=255.255.255.0"/> + <param name="ovsbridge3" value="DEVICE=ovsbridge3 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.6.21 NETMASK=255.255.255.0"/> + <param name="p1p1" value="DEVICE=p1p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1"/> + <param name="p2p1" value="DEVICE=p2p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge2"/> + <param name="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge3"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> @@ -304,6 +196,36 @@ EOF <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/> + <param name="WHITEBOARD" value="tg3"/> + <param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/> + <param name="rhel6u4_1" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.3;192.168.1.4;192.168.1.5;192.168.1.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.3;192.168.1.4;192.168.1.5;192.168.1.6"/> + <param name="rhel6u4_3" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.3;192.168.1.4;192.168.1.5;192.168.1.6"/> + </params> + </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/> + <param name="WHITEBOARD" value="bnx2x"/> + <param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/> + <param name="rhel6u4_1" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.3;192.168.2.4;192.168.2.5;192.168.2.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.3;192.168.2.4;192.168.2.5;192.168.2.6"/> + <param name="rhel6u4_3" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.3;192.168.2.4;192.168.2.5;192.168.2.6"/> + </params> + </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/> + <param name="WHITEBOARD" value="ixgbe"/> + <param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/> + <param name="rhel6u4_1" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.3;192.168.6.4;192.168.6.5;192.168.6.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.3;192.168.6.4;192.168.6.5;192.168.6.6"/> + <param name="rhel6u4_3" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.3;192.168.6.4;192.168.6.5;192.168.6.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -311,7 +233,7 @@ EOF </task> </recipe> <recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_4 rhel6u4_5 rhel6u4_6"> - <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_4" role="None"> + <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_4" role="None"> <autopick random="false"/> <watchdog panic="None"/> <packages/> @@ -334,6 +256,11 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install netperf"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> @@ -343,34 +270,13 @@ EOF <param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.4 NETMASK=255.255.255.0"/> </params> </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/> - <param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/> - <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/> - <param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/> - </params> - </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_5" role="None"> + <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_5" role="None"> <autopick random="false"/> <watchdog panic="None"/> <packages/> @@ -393,6 +299,11 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install netperf"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> @@ -402,34 +313,13 @@ EOF <param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.5 NETMASK=255.255.255.0"/> </params> </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/> - <param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/> - <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/> - <param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/> - </params> - </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_6" role="None"> + <guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_6" role="None"> <autopick random="false"/> <watchdog panic="None"/> <packages/> @@ -452,6 +342,11 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install netperf"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> @@ -461,27 +356,6 @@ EOF <param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.6 NETMASK=255.255.255.0"/> </params> </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="INVALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/> - <param name="VALID_ADDRS" value="192.168.1.3 192.168.1.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="INVALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/> - <param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> - <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/> - <param name="INVALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/> - <param name="VALID_ADDRS" value="192.168.6.3 192.168.6.6"/> - </params> - </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -491,85 +365,7 @@ EOF <autopick random="false"/> <watchdog panic="None"/> <packages/> - <ks_appends> - <ks_append><![CDATA[ -yum -y install openvswitch - -# Turn on openvswitch -chkconfig --add openvswitch - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge1 -DEVICE=ovsbridge1 -ONBOOT=yes -DEVICETYPE=ovs -TYPE=OVSBridge -HOTPLUG=no -OVSBOOTPROTO="static" -IPADDR=192.168.1.41 -NETMASK=255.255.255.0 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge2 -DEVICE=ovsbridge2 -ONBOOT=yes -DEVICETYPE=ovs -TYPE=OVSBridge -HOTPLUG=no -OVSBOOTPROTO="static" -IPADDR=192.168.2.41 -NETMASK=255.255.255.0 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge3 -DEVICE=ovsbridge3 -ONBOOT=yes -DEVICETYPE=ovs -TYPE=OVSBridge -HOTPLUG=no -OVSBOOTPROTO="static" -IPADDR=192.168.6.41 -NETMASK=255.255.255.0 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1 -DEVICE=p1p1 -HWADDR=00:10:18:E5:EF:8C -#TYPE=Ethernet -UUID=f8d7e17f-bb46-4e4c-98d7-3ffdd32a43d7 -ONBOOT=yes -NM_CONTROLLED=no -BOOTPROTO=none -DEVICETYPE=ovs -TYPE=OVSPort -OVS_BRIDGE=ovsbridge1 -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1 -DEVICE=p2p1 -DEVICETYPE=ovs -TYPE=OVSPort -#HWADDR=00:10:18:E8:65:B0 -#TYPE=Ethernet -#UUID=02535d4b-6819-4885-abc5-c08d889e589c -ONBOOT=yes -BOOTPROTO=none -OVS_BRIDGE=ovsbridge2 -HOTPLUG=no -EOF - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -DEVICE=p6p1 -DEVICETYPE=ovs -TYPE=OVSPort -HWADDR=A0:36:9F:08:2D:34 -UUID=1c5be512-f3f9-4bf2-941e-dbed6c27118e -ONBOOT=yes -NM_CONTROLLED=no -BOOTPROTO=none -OVS_BRIDGE=ovsbridge3 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> <!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/">--> @@ -601,6 +397,23 @@ EOF <param name="KILLTIMEOVERRIDE" value="59280"/> </params> </task> + <task name="/distribution/command" role="STANDALONE"> + <params> + <param name="CMDS_TO_RUN" value="yum -y install openvswitch; chkconfig --add openvswitch"/> + </params> + </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="ovsbridge1 ovsbridge2 ovsbridge3 p1p1 p2p1 p6p1"/> + <param name="ovsbridge1" value="DEVICE=ovsbridge1 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.1.41 NETMASK=255.255.255.0"/> + <param name="ovsbridge2" value="DEVICE=ovsbridge2 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.2.41 NETMASK=255.255.255.0"/> + <param name="ovsbridge3" value="DEVICE=ovsbridge3 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.6.41 NETMASK=255.255.255.0"/> + <param name="p1p1" value="DEVICE=p1p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1"/> + <param name="p2p1" value="DEVICE=p2p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge2"/> + <param name="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge3"/> + </params> + </task> <task name="/distribution/get_task" role="STANDALONE"> <params> <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> @@ -613,19 +426,36 @@ EOF <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> - <!-- - Wait for guests to finish setting up networks - <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/netperf"/> - <param name="WHITEBOARD" value="tg3/"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/> + <param name="WHITEBOARD" value="tg3"/> + <param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/> + <param name="rhel6u4_4" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.3;192.168.1.4;192.168.1.5;192.168.1.6"/> + <param name="rhel6u4_5" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.3;192.168.1.4;192.168.1.5;192.168.1.6"/> + <param name="rhel6u4_6" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.3;192.168.1.4;192.168.1.5;192.168.1.6"/> + </params> + </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/> + <param name="WHITEBOARD" value="bnx2x"/> + <param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/> + <param name="rhel6u4_4" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.3;192.168.2.4;192.168.2.5;192.168.2.6"/> + <param name="rhel6u4_5" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.3;192.168.2.4;192.168.2.5;192.168.2.6"/> + <param name="rhel6u4_6" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.3;192.168.2.4;192.168.2.5;192.168.2.6"/> + </params> + </task> + <task name="/distribution/get_task" role="STANDALONE"> + <params> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/> + <param name="WHITEBOARD" value="ixgbe"/> <param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/> - <param name="rhel6u4_4" value="valid_addrs=192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5 invalid_addrs=192.168.2.3 192.168.2.6"/> - <param name="rhel6u4_5" value="valid_addrs=192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5 invalid_addrs=192.168.2.3 192.168.2.6"/> - <param name="rhel6u4_6" value="valid_addrs=192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5 invalid_addrs=192.168.2.3 192.168.2.6"/> - - --> + <param name="rhel6u4_4" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.3;192.168.6.4;192.168.6.5;192.168.6.6"/> + <param name="rhel6u4_5" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.3;192.168.6.4;192.168.6.5;192.168.6.6"/> + <param name="rhel6u4_6" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.3;192.168.6.4;192.168.6.5;192.168.6.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> |