diff options
-rw-r--r-- | kernel/networking/netperf/Makefile | 1 | ||||
-rwxr-xr-x | kernel/networking/ping/runtest.sh | 4 | ||||
-rw-r--r-- | openvswitch-job.xml | 5 | ||||
-rw-r--r-- | openvswitch-ovs2_4-vlan.xml | 43 | ||||
-rw-r--r-- | openvswitch-ovs2_4.xml | 40 |
5 files changed, 60 insertions, 33 deletions
diff --git a/kernel/networking/netperf/Makefile b/kernel/networking/netperf/Makefile index 5b2daf0..932cac0 100644 --- a/kernel/networking/netperf/Makefile +++ b/kernel/networking/netperf/Makefile @@ -48,3 +48,4 @@ $(METADATA): Makefile @echo "License: GPLv2" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) @echo "Destructive: no" >> $(METADATA) + @echo "Requires: netperf" >> $(METADATA) diff --git a/kernel/networking/ping/runtest.sh b/kernel/networking/ping/runtest.sh index b44a9de..f073426 100755 --- a/kernel/networking/ping/runtest.sh +++ b/kernel/networking/ping/runtest.sh @@ -37,8 +37,8 @@ PACKAGE="openvswitch" rpm -q $PACKAGE || fail "$PACKAGE not installed" for addr in $INVALID_ADDRS; do - ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr && report_result $TEST/$addr FAIL 1 || report_result $TEST/$addr PASS 0 + ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr && report_result $TEST/INVALID/$addr FAIL 1 || report_result $TEST/INVALID/$addr PASS 0 done for addr in $VALID_ADDRS; do - ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr && report_result $TEST/$addr PASS 0 || report_result $TEST/$addr FAIL 1 + ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr && report_result $TEST/VALID/$addr PASS 0 || report_result $TEST/VALID/$addr FAIL 1 done diff --git a/openvswitch-job.xml b/openvswitch-job.xml index 8c5df26..ba63b8d 100644 --- a/openvswitch-job.xml +++ b/openvswitch-job.xml @@ -96,12 +96,11 @@ </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> - <packages> - <package name="@kvm"/> - </packages> + <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> diff --git a/openvswitch-ovs2_4-vlan.xml b/openvswitch-ovs2_4-vlan.xml index 4f63224..2b8b55c 100644 --- a/openvswitch-ovs2_4-vlan.xml +++ b/openvswitch-ovs2_4-vlan.xml @@ -20,7 +20,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -68,7 +70,12 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -116,7 +123,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -150,12 +159,11 @@ EOF </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> - <packages> - <package name="@kvm"/> - <package name="openvswitch"/> - </packages> + <packages/> <ks_appends> <ks_append><![CDATA[ +yum -y install openvswitch + # Turn on openvswitch chkconfig --add openvswitch @@ -267,6 +275,7 @@ EOF </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> @@ -331,7 +340,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -379,7 +390,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -427,7 +440,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -461,12 +476,11 @@ EOF </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> - <packages> - <package name="@kvm"/> - <package name="openvswitch"/> - </packages> + <packages/> <ks_appends> <ks_append><![CDATA[ +yum -y install openvswitch + # Turn on openvswitch chkconfig --add openvswitch @@ -577,6 +591,7 @@ EOF </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> diff --git a/openvswitch-ovs2_4.xml b/openvswitch-ovs2_4.xml index dd0653e..dece876 100644 --- a/openvswitch-ovs2_4.xml +++ b/openvswitch-ovs2_4.xml @@ -20,7 +20,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -67,7 +69,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -114,7 +118,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -147,12 +153,11 @@ EOF </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> - <packages> - <package name="@kvm"/> - <package name="openvswitch"/> - </packages> + <packages/> <ks_appends> <ks_append><![CDATA[ +yum -y install openvswitch + # Turn on openvswitch chkconfig --add openvswitch @@ -264,6 +269,7 @@ EOF </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> @@ -326,7 +332,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -373,7 +381,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -420,7 +430,9 @@ NETMASK=255.255.255.0 EOF ]]></ks_append> </ks_appends> - <repos/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -453,12 +465,11 @@ EOF </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> - <packages> - <package name="@kvm"/> - <package name="openvswitch"/> - </packages> + <packages/> <ks_appends> <ks_append><![CDATA[ +yum -y install openvswitch + # Turn on openvswitch chkconfig --add openvswitch @@ -569,6 +580,7 @@ EOF </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> |