diff options
| author | Bill Peck <bpeck@redhat.com> | 2013-01-31 14:22:23 -0500 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2013-01-31 14:22:23 -0500 |
| commit | 5f90020c024814df96d34700dc86ebe43576a5c4 (patch) | |
| tree | 6ec9cff7f8f52d3400842726ecccc022073f4bc8 | |
| parent | e16b0600cf1798267dc5722d39fc03e1e135e1f6 (diff) | |
| download | tests-5f90020c024814df96d34700dc86ebe43576a5c4.tar.gz tests-5f90020c024814df96d34700dc86ebe43576a5c4.tar.xz tests-5f90020c024814df96d34700dc86ebe43576a5c4.zip | |
Update test plans
| -rw-r--r-- | openvswitch-ovs2_4-bnx2x-vlan.xml | 446 | ||||
| -rw-r--r-- | openvswitch-ovs2_4-ixgbe-vlan.xml | 325 | ||||
| -rw-r--r-- | openvswitch-ovs2_4-tg3-vlan.xml | 361 | ||||
| -rw-r--r-- | openvswitch-ovs2_4-vlan.xml | 434 |
4 files changed, 424 insertions, 1142 deletions
diff --git a/openvswitch-ovs2_4-bnx2x-vlan.xml b/openvswitch-ovs2_4-bnx2x-vlan.xml index 5ecf0df..ad1d117 100644 --- a/openvswitch-ovs2_4-bnx2x-vlan.xml +++ b/openvswitch-ovs2_4-bnx2x-vlan.xml @@ -1,25 +1,14 @@ <job retention_tag="120days"> <whiteboard> - bnx2x openvswitch vlan100 and vlan200 + bnx2x openvswitch with vlans </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" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.1 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -38,16 +27,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.1 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -56,22 +45,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.2 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -90,16 +68,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.2 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -108,22 +86,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.3 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -142,16 +109,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.3 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -162,121 +129,7 @@ EOF </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.2.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.66.21 -#NETMASK=255.255.255.0 -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1 -#DEVICE=p1p1 -#HWADDR=00:10:18:E5:EA:5C -#TYPE=Ethernet -#UUID=050742c1-1e01-4df2-83d0-04737a1c5bfa -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p2 -#DEVICE=p1p2 -#HWADDR=00:10:18:E5:EA:5D -#TYPE=Ethernet -#UUID=85fd60f3-2d65-47b4-8bb9-4a553416b2e0 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p3 -#DEVICE=p1p3 -#HWADDR=00:10:18:E5:EA:5E -#TYPE=Ethernet -#UUID=7e9fddc4-de46-4edf-8ac1-790191fd0339 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p4 -#DEVICE=p1p4 -#HWADDR=00:10:18:E5:EA:5F -#TYPE=Ethernet -#UUID=7c67e198-40f8-4c84-85d5-5530b90eb3e4 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF - -# p2p1 Under TEST!! -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1 -DEVICE=p2p1 -DEVICETYPE=ovs -TYPE=OVSPort -#HWADDR=00:10:18:E8:7F:D0 -#TYPE=Ethernet -#UUID=21522d02-db38-4ba5-9cc7-07fb589f83cd -ONBOOT=yes -BOOTPROTO=none -OVS_BRIDGE=ovsbridge1 -OVS_OPTIONS="trunk=100,200" -HOTPLUG=no -EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p2 -#DEVICE=p2p2 -#HWADDR=00:10:18:E8:7F:D2 -#TYPE=Ethernet -#UUID=32e2cdcd-f4c3-424e-8c26-a554d598b0d6 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -#DEVICE=p6p1 -#DEVICETYPE=ovs -#TYPE=OVSPort -##HWADDR=A0:36:9F:08:2B:C4 -##TYPE=Ethernet -##UUID=9b17ffe0-d791-4ec2-92a4-6e96407feb60 -#ONBOOT=yes -#NM_CONTROLLED=no -#BOOTPROTO=none -#OVS_BRIDGE=ovsbridge2 -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p2 -#DEVICE=p6p2 -#HWADDR=A0:36:9F:08:2B:C6 -#TYPE=Ethernet -#UUID=91fd6c7d-5ecd-4cfd-af05-45be6e448c46 -#ONBOOT=no -#NM_CONTROLLED=yes -#BOOTPROTO=dhcp -#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/">--> @@ -308,21 +161,41 @@ 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 p2p1"/> + <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="p2p1" value="DEVICE=p2p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/> + </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"/> <param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/> - <param name="rhel6u4_1" value="switch=ovsbridge1;tag=100"/> - <param name="rhel6u4_2" value="switch=ovsbridge1;tag=100"/> - <param name="rhel6u4_3" value="switch=ovsbridge1;tag=200"/> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> --> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> --> - <!-- <param name="VLANS" value="100 101"/> --> + <param name="rhel6u4_1" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_2" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_3" value="switch=ovsbridge1;tag=200"/> </params> </task> <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="bnx2x"/> + <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.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_3" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -330,22 +203,11 @@ 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" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.4 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -364,16 +226,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.4 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -382,22 +244,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.5 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -416,16 +267,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.5 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -434,22 +285,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.6 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -468,16 +308,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.6 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -489,119 +329,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.2.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.66.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=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p2 -#DEVICE=p1p2 -#HWADDR=00:10:18:E5:EF:8D -#TYPE=Ethernet -#UUID=cbffd134-2a40-45eb-8d18-ee9ee72b63e7 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p3 -#DEVICE=p1p3 -#HWADDR=00:10:18:E5:EF:8E -#TYPE=Ethernet -#UUID=5fe3cc75-c6b9-4347-954b-c9c82b633ea9 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p4 -#DEVICE=p1p4 -#HWADDR=00:10:18:E5:EF:8F -#TYPE=Ethernet -#UUID=cf4396d0-2979-4f1a-9fb3-9b28e54df897 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF - -# p2p1 Under TEST!! -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=ovsbridge1 -OVS_OPTIONS="trunk=100,200" -HOTPLUG=no -EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p2 -#DEVICE=p2p2 -#HWADDR=00:10:18:E8:65:B2 -#TYPE=Ethernet -#UUID=ab634daf-aab8-4852-9bcc-8d46cf5511ce -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -#DEVICE=p6p1 -#DEVICETYPE=ovs -#TYPE=OVSPort -##HWADDR=A0:36:9F:08:2D:34 -##TYPE=Ethernet -##UUID=1c5be512-f3f9-4bf2-941e-dbed6c27118e -#ONBOOT=yes -#NM_CONTROLLED=no -#BOOTPROTO=none -#OVS_BRIDGE=ovsbridge2 -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p2 -#DEVICE=p6p2 -#HWADDR=A0:36:9F:08:2D:36 -#TYPE=Ethernet -#UUID=06569135-c76b-43ea-9329-5266f78d0e22 -#ONBOOT=no -#NM_CONTROLLED=yes -#BOOTPROTO=dhcp - ]]></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/">--> @@ -633,21 +361,41 @@ 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 p2p1"/> + <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="p2p1" value="DEVICE=p2p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/> + </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"/> <param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/> - <param name="rhel6u4_4" value="switch=ovsbridge1;tag=100"/> - <param name="rhel6u4_5" value="switch=ovsbridge1;tag=100"/> - <param name="rhel6u4_6" value="switch=ovsbridge1;tag=200"/> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> --> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> --> - <!-- <param name="VLANS" value="100 101"/> --> + <param name="rhel6u4_4" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_5" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_6" value="switch=ovsbridge1;tag=200"/> </params> </task> <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="bnx2x"/> + <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.1.3;192.168.1.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.1.3;192.168.1.6"/> + <param name="rhel6u4_6" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> diff --git a/openvswitch-ovs2_4-ixgbe-vlan.xml b/openvswitch-ovs2_4-ixgbe-vlan.xml index 4565311..33940da 100644 --- a/openvswitch-ovs2_4-ixgbe-vlan.xml +++ b/openvswitch-ovs2_4-ixgbe-vlan.xml @@ -1,25 +1,14 @@ <job retention_tag="120days"> <whiteboard> - ixgbe openvswitch vlan100 and vlan200 + ixgbe openvswitch with vlans </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" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.1 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -38,16 +27,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.1 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -56,22 +45,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.2 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -90,16 +68,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.2 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -108,22 +86,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.3 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -142,16 +109,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.3 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -162,59 +129,7 @@ EOF </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.2.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.66.21 -#NETMASK=255.255.255.0 -#EOF - - -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -DEVICE=p6p1 -DEVICETYPE=ovs -TYPE=OVSPort -HWADDR=A0:36:9F:08:2B:C4 -ONBOOT=yes -NM_CONTROLLED=no -BOOTPROTO=none -OVS_BRIDGE=ovsbridge1 -OVS_OPTIONS="trunk=100,200" -EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p2 -#DEVICE=p6p2 -#HWADDR=A0:36:9F:08:2B:C6 -#TYPE=Ethernet -#UUID=91fd6c7d-5ecd-4cfd-af05-45be6e448c46 -#ONBOOT=no -#NM_CONTROLLED=yes -#BOOTPROTO=dhcp -#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/">--> @@ -246,21 +161,41 @@ 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 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="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/> + </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"/> - <param name="SWITCHES" value="ovsbridge1"/> - <param name="VLANS_ovsbridge1" value="vlan100 vlan200"/> - <param name="vlan100" value="rhel6u4_1 rhel6u4_2"/> - <param name="vlan200" value="rhel6u4_3"/> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> --> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> --> - <!-- <param name="VLANS" value="100 101"/> --> + <param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/> + <param name="rhel6u4_1" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_2" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_3" value="switch=ovsbridge1;tag=200"/> </params> </task> <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="ixgbe"/> + <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.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_3" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -268,22 +203,11 @@ 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" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.4 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -302,16 +226,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.4 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -320,22 +244,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.5 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -354,16 +267,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.5 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -372,22 +285,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.6 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -406,16 +308,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.6 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -427,56 +329,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.2.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.66.41 -#NETMASK=255.255.255.0 -#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=ovsbridge1 -EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p2 -#DEVICE=p6p2 -#HWADDR=A0:36:9F:08:2D:36 -#TYPE=Ethernet -#UUID=06569135-c76b-43ea-9329-5266f78d0e22 -#ONBOOT=no -#NM_CONTROLLED=yes -#BOOTPROTO=dhcp - ]]></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/">--> @@ -508,21 +361,41 @@ 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 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="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/> + </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"/> - <param name="SWITCHES" value="ovsbridge1"/> - <param name="VLANS_ovsbridge1" value="vlan100 vlan200"/> - <param name="vlan100" value="rhel6u4_4 rhel6u4_5"/> - <param name="vlan200" value="rhel6u4_6"/> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> --> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> --> - <!-- <param name="VLANS" value="100 101"/> --> + <param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/> + <param name="rhel6u4_4" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_5" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_6" value="switch=ovsbridge1;tag=200"/> </params> </task> <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="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.1.3;192.168.1.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.1.3;192.168.1.6"/> + <param name="rhel6u4_6" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> diff --git a/openvswitch-ovs2_4-tg3-vlan.xml b/openvswitch-ovs2_4-tg3-vlan.xml index 41c81b3..cc9d551 100644 --- a/openvswitch-ovs2_4-tg3-vlan.xml +++ b/openvswitch-ovs2_4-tg3-vlan.xml @@ -1,25 +1,14 @@ <job retention_tag="120days"> <whiteboard> - tg3 openvswitch vlan100 and vlan200 + tg3 openvswitch with vlans </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" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.1 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -38,16 +27,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.1 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -56,22 +45,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.2 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -90,16 +68,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.2 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -108,22 +86,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.3 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -142,16 +109,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.3 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -162,76 +129,7 @@ EOF </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.2.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.66.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 -OVS_OPTIONS="trunk=100,200" -EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p2 -#DEVICE=p1p2 -#HWADDR=00:10:18:E5:EA:5D -#TYPE=Ethernet -#UUID=85fd60f3-2d65-47b4-8bb9-4a553416b2e0 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p3 -#DEVICE=p1p3 -#HWADDR=00:10:18:E5:EA:5E -#TYPE=Ethernet -#UUID=7e9fddc4-de46-4edf-8ac1-790191fd0339 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p4 -#DEVICE=p1p4 -#HWADDR=00:10:18:E5:EA:5F -#TYPE=Ethernet -#UUID=7c67e198-40f8-4c84-85d5-5530b90eb3e4 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#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/">--> @@ -263,21 +161,41 @@ 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 p1p1"/> + <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="p1p1" value="DEVICE=p1p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/> + </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"/> - <param name="SWITCHES" value="ovsbridge1"/> - <param name="VLANS_ovsbridge1" value="vlan100 vlan200"/> - <param name="vlan100" value="rhel6u4_1 rhel6u4_2"/> - <param name="vlan200" value="rhel6u4_3"/> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> --> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> --> - <!-- <param name="VLANS" value="100 101"/> --> + <param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/> + <param name="rhel6u4_1" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_2" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_3" value="switch=ovsbridge1;tag=200"/> </params> </task> <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.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_3" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -285,22 +203,11 @@ 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" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.4 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -319,16 +226,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.4 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -337,22 +244,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.5 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -371,16 +267,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.5 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -389,22 +285,11 @@ EOF </params> </task> </guestrecipe> - <guestrecipe guestargs=" -s 10 --hvm --kvm" 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/> - <ks_appends> - <ks_append><![CDATA[ -cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1 -DEVICE=eth1 -ONBOOT=yes -TYPE="Ethernet" -HOTPLUG=no -IPADDR=192.168.2.6 -NETMASK=255.255.255.0 -EOF - ]]></ks_append> - </ks_appends> + <ks_appends/> <repos> <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> </repos> @@ -423,16 +308,16 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/command" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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/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"/> + <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/> + <param name="INTERFACES" value="eth1 eth2 eth3"/> + <param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.6 NETMASK=255.255.255.0"/> </params> </task> <task name="/distribution/reservesys"> @@ -444,75 +329,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.2.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.66.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-p1p2 -#DEVICE=p1p2 -#HWADDR=00:10:18:E5:EF:8D -#TYPE=Ethernet -#UUID=cbffd134-2a40-45eb-8d18-ee9ee72b63e7 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p3 -#DEVICE=p1p3 -#HWADDR=00:10:18:E5:EF:8E -#TYPE=Ethernet -#UUID=5fe3cc75-c6b9-4347-954b-c9c82b633ea9 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p4 -#DEVICE=p1p4 -#HWADDR=00:10:18:E5:EF:8F -#TYPE=Ethernet -#UUID=cf4396d0-2979-4f1a-9fb3-9b28e54df897 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#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/">--> @@ -544,21 +361,41 @@ 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 p1p1"/> + <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="p1p1" value="DEVICE=p1p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/> + </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"/> - <param name="SWITCHES" value="ovsbridge1"/> - <param name="VLANS_ovsbridge1" value="vlan100 vlan200"/> - <param name="vlan100" value="rhel6u4_4 rhel6u4_5"/> - <param name="vlan200" value="rhel6u4_6"/> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> --> - <!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> --> - <!-- <param name="VLANS" value="100 101"/> --> + <param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/> + <param name="rhel6u4_4" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_5" value="switch=ovsbridge1;tag=100"/> + <param name="rhel6u4_6" value="switch=ovsbridge1;tag=200"/> </params> </task> <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_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.1.3;192.168.1.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.1.3;192.168.1.6"/> + <param name="rhel6u4_6" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> diff --git a/openvswitch-ovs2_4-vlan.xml b/openvswitch-ovs2_4-vlan.xml index 90b8a42..dd5d77d 100644 --- a/openvswitch-ovs2_4-vlan.xml +++ b/openvswitch-ovs2_4-vlan.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,87 +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 -OVS_OPTIONS="trunk=100,200" -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 -OVS_OPTIONS="trunk=101,201" -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 -OVS_OPTIONS="trunk=102,202" -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/">--> @@ -295,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 OVS_OPTIONS=trunk=100,200"/> + <param name="p2p1" value="DEVICE=p2p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge2 OVS_OPTIONS=trunk=101,201"/> + <param name="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge3 OVS_OPTIONS=trunk=102,202"/> + </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"/> @@ -307,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.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/> + <param name="rhel6u4_3" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=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/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.4;192.168.2.5 invalid_addrs=192.168.2.3;192.168.2.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.4;192.168.2.5 invalid_addrs=192.168.2.3;192.168.2.6"/> + <param name="rhel6u4_3" value="invalid_addrs=192.168.2.1;192.168.2.2;192.168.2.4;192.168.2.5 valid_addrs=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/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.4;192.168.6.5 invalid_addrs=192.168.6.3;192.168.6.6"/> + <param name="rhel6u4_2" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.4;192.168.6.5 invalid_addrs=192.168.6.3;192.168.6.6"/> + <param name="rhel6u4_3" value="invalid_addrs=192.168.6.1;192.168.6.2;192.168.6.4;192.168.6.5 valid_addrs=192.168.6.3;192.168.6.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> @@ -314,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/> @@ -337,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"/> @@ -346,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/> @@ -396,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"/> @@ -405,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/> @@ -455,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"/> @@ -464,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"/> @@ -494,88 +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 -OVS_OPTIONS="trunk=100,200" -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 -OVS_OPTIONS="trunk=101,201" -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 -OVS_OPTIONS="trunk=102,202" -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/">--> @@ -607,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 OVS_OPTIONS=trunk=100,200"/> + <param name="p2p1" value="DEVICE=p2p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge2 OVS_OPTIONS=trunk=101,201"/> + <param name="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge3 OVS_OPTIONS=trunk=102,202"/> + </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"/> @@ -619,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.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.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.1.3;192.168.1.6"/> + <param name="rhel6u4_6" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=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/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.4;192.168.2.5 invalid_addrs=192.168.2.3;192.168.2.6"/> + <param name="rhel6u4_5" value="valid_addrs=192.168.2.1;192.168.2.2;192.168.2.4;192.168.2.5 invalid_addrs=192.168.2.3;192.168.2.6"/> + <param name="rhel6u4_6" value="invalid_addrs=192.168.2.1;192.168.2.2;192.168.2.4;192.168.2.5 valid_addrs=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/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.4;192.168.6.5 invalid_addrs=192.168.6.3;192.168.6.6"/> + <param name="rhel6u4_5" value="valid_addrs=192.168.6.1;192.168.6.2;192.168.6.4;192.168.6.5 invalid_addrs=192.168.6.3;192.168.6.6"/> + <param name="rhel6u4_6" value="invalid_addrs=192.168.6.1;192.168.6.2;192.168.6.4;192.168.6.5 valid_addrs=192.168.6.3;192.168.6.6"/> + </params> + </task> <task name="/distribution/reservesys"> <params> <param name="RESERVE_IF_FAIL" value="True"/> |