summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2013-05-31 09:40:28 -0400
committerBill Peck <bpeck@redhat.com>2013-05-31 09:40:28 -0400
commit4b159e5098e6f186ceda058375374c030b1a583a (patch)
tree09b6b21f3f94ee2cb774f07b57633d19a8ea850e
parent994903f001c042ea4067331f8f668e5ddc9de51c (diff)
downloadtests-4b159e5098e6f186ceda058375374c030b1a583a.tar.gz
tests-4b159e5098e6f186ceda058375374c030b1a583a.tar.xz
tests-4b159e5098e6f186ceda058375374c030b1a583a.zip
Updated README with useful info, and removed unneeded xml.
-rw-r--r--README18
-rw-r--r--openvswitch-job.xml152
2 files changed, 17 insertions, 153 deletions
diff --git a/README b/README
index ea4e789..0e1de01 100644
--- a/README
+++ b/README
@@ -1 +1,17 @@
-Just make a second commit
+
+Hardware specific xml's
+------------------------------------
+openvswitch-ovs2_4-baseconnectivity-tg3.xml
+openvswitch-ovs2_4-baseconnectivity.xml
+openvswitch-ovs2_4-bnx2x-vlan.xml
+openvswitch-ovs2_4-ixgbe-vlan.xml
+openvswitch-ovs2_4-tg3-vlan.xml
+openvswitch-ovs2_4-vlan.xml
+openvswitch-ovs2_4.xml
+------------------------------------
+Machines required:
+qe-dell-ovs2.lab.bos.redhat.com
+qe-dell-ovs4.lab.bos.redhat.com
+
+openvswitch-vlan.xml does not require any specific machine and will run the vlan tests
+between the guests on this machine.
diff --git a/openvswitch-job.xml b/openvswitch-job.xml
deleted file mode 100644
index 74a4ec9..0000000
--- a/openvswitch-job.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<job retention_tag="120days">
- <whiteboard>
- virt-install, convert to openvswitch
- </whiteboard>
- <recipeSet priority="High">
- <recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_x86_64_hvm/rhel6u4_i386_hvm">
- <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_x86_64_hvm_1" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="hvm install of guest=rhel6u4_x86_64_hvm vcpus=1 memory=1024 container=file installer=nfs" role="vlan100">
- <autopick random="false"/>
- <watchdog panic="None"/>
- <packages/>
- <ks_appends/>
- <repos/>
- <distroRequires>
- <and>
- <distro_family op="=" value="RedHatEnterpriseLinux6"/>
- <distro_tag op="=" value="STABLE"/>
- <distro_variant op="=" value="Server"/>
- <distro_arch op="=" value="x86_64"/>
- </and>
- </distroRequires>
- <hostRequires>
- <system_type value="Virtual"/>
- </hostRequires>
- <partitions/>
- <task name="/distribution/install" role="STANDALONE">
- <params/>
- </task>
- <task name="/distribution/command" role="STANDALONE">
- <params>
- <param name="CMDS_TO_RUN" value="sleep 1000"/>
- </params>
- </task>
- <task name="/distribution/reservesys">
- <params>
- <param name="RESERVE_IF_FAIL" value="True"/>
- </params>
- </task>
- </guestrecipe>
- <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_x86_64_hvm_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="hvm install of guest=rhel6u4_x86_64_hvm vcpus=1 memory=1024 container=file installer=nfs" role="vlan100">
- <autopick random="false"/>
- <watchdog panic="None"/>
- <packages/>
- <ks_appends/>
- <repos/>
- <distroRequires>
- <and>
- <distro_family op="=" value="RedHatEnterpriseLinux6"/>
- <distro_tag op="=" value="STABLE"/>
- <distro_variant op="=" value="Server"/>
- <distro_arch op="=" value="x86_64"/>
- </and>
- </distroRequires>
- <hostRequires>
- <system_type value="Virtual"/>
- </hostRequires>
- <partitions/>
- <task name="/distribution/install" role="STANDALONE">
- <params/>
- </task>
- <task name="/distribution/command" role="STANDALONE">
- <params>
- <param name="CMDS_TO_RUN" value="sleep 1000"/>
- </params>
- </task>
- <task name="/distribution/reservesys">
- <params>
- <param name="RESERVE_IF_FAIL" value="True"/>
- </params>
- </task>
- </guestrecipe>
- <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_i386_hvm_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="hvm install of guest=rhel6u4_i386_hvm vcpus=1 memory=1024 container=file installer=nfs" role="vlan101">
- <autopick random="false"/>
- <watchdog panic="None"/>
- <packages/>
- <ks_appends/>
- <repos/>
- <distroRequires>
- <and>
- <distro_family op="=" value="RedHatEnterpriseLinux6"/>
- <distro_tag op="=" value="STABLE"/>
- <distro_variant op="=" value="Server"/>
- <distro_arch op="=" value="i386"/>
- </and>
- </distroRequires>
- <hostRequires>
- <system_type value="Virtual"/>
- </hostRequires>
- <partitions/>
- <task name="/distribution/install" role="STANDALONE">
- <params/>
- </task>
- <task name="/distribution/command" role="STANDALONE">
- <params>
- <param name="CMDS_TO_RUN" value="sleep 1000"/>
- </params>
- </task>
- <task name="/distribution/reservesys">
- <params>
- <param name="RESERVE_IF_FAIL" value="True"/>
- </params>
- </task>
- </guestrecipe>
- <autopick random="false"/>
- <watchdog panic="None"/>
- <packages/>
- <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/">-->
- </repos>
- <distroRequires>
- <and>
- <distro_family op="=" value="RedHatEnterpriseLinux6"/>
- <distro_tag op="=" value="STABLE"/>
- <distro_variant op="=" value="Server"/>
- <distro_arch op="=" value="x86_64"/>
- </and>
- </distroRequires>
- <hostRequires>
- <and>
- <arch op="=" value="x86_64"/>
- <key_value key="HVM" op="=" value="1"/>
- </and>
- <system_type value="Machine"/>
- </hostRequires>
- <partitions/>
- <task name="/distribution/install" role="STANDALONE">
- <params/>
- </task>
- <task name="/distribution/virt/install" role="STANDALONE">
- <params>
- <param name="KILLTIMEOVERRIDE" value="59280"/>
- </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/br_to_vswitch"/>
- <!-- <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"/> -->
- </params>
- </task>
- <task name="/distribution/virt/start" role="STANDALONE">
- <params/>
- </task>
- <task name="/distribution/reservesys">
- <params>
- <param name="RESERVE_IF_FAIL" value="True"/>
- </params>
- </task>
- </recipe>
- </recipeSet>
-</job>