diff options
| author | Bill Peck <bpeck@redhat.com> | 2015-05-26 10:30:48 -0400 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2015-05-26 10:30:48 -0400 |
| commit | 95c03057db4c79c032cb488c76daecc7f22c21be (patch) | |
| tree | 4e0580c8409b95483908d876557dd91e50ff5078 | |
| parent | b86a010bed1c3822cda364594010e79e661df15d (diff) | |
| download | tests-95c03057db4c79c032cb488c76daecc7f22c21be.tar.gz tests-95c03057db4c79c032cb488c76daecc7f22c21be.tar.xz tests-95c03057db4c79c032cb488c76daecc7f22c21be.zip | |
git-annex automatic sync
| -rwxr-xr-x | kernel/kernelinstall/runtest.sh | 2 | ||||
| -rw-r--r-- | openvswitch-vlan.xml | 180 |
2 files changed, 16 insertions, 166 deletions
diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh index 215a402..c7ef89b 100755 --- a/kernel/kernelinstall/runtest.sh +++ b/kernel/kernelinstall/runtest.sh @@ -398,7 +398,7 @@ function update_console () # Find our defult kernel default_kernel=$(grubby --default-kernel) # Get the serial settings and order them for XEN - settings=$(echo $console |perl -pe 's/.*,([0-9]+)([neo])?([5678])?/$1,$3$2/') + settings=$(echo $console |perl -pe 's/.*,([0-9]+)([neo])?([5678])?1?/$1,$3${2}1/') DeBug $console if echo $console | grep -q ttyS0 ; then diff --git a/openvswitch-vlan.xml b/openvswitch-vlan.xml index f9e8d96..9681acb 100644 --- a/openvswitch-vlan.xml +++ b/openvswitch-vlan.xml @@ -1,139 +1,16 @@ <job retention_tag="120days"> <whiteboard> - openvswitch with vlans + run tests from git using restraint </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="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_1" role="None"> - <autopick random="false"/> - <watchdog panic="None"/> - <packages/> - <ks_appends/> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </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="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"/> - <param name="INTERFACES" value="eth1"/> - <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"> - <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="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_u2" role="None"> - <autopick random="false"/> - <watchdog panic="None"/> - <packages/> - <ks_appends/> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </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="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"/> - <param name="INTERFACES" value="eth1"/> - <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"> - <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="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_3" role="None"> - <autopick random="false"/> - <watchdog panic="None"/> - <packages/> - <ks_appends/> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </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="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"/> - <param name="INTERFACES" value="eth1"/> - <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"> - <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> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -143,50 +20,28 @@ </and> </distroRequires> <hostRequires> - <and> - <system> - <arch op="=" value="x86_64"/> - </system> - <key_value key="HVM" op="=" value="1"/> - </and> - <system_type value="Machine"/> + <system_type value="Virtual"/> </hostRequires> <partitions/> - <task name="/distribution/install" role="STANDALONE"> - <params/> - </task> - <task name="/distribution/virt/install" role="SERVERS"> + <task name="/kernel/networking/add_interface" role="STANDALONE" id="1" status="Waiting"> + <fetch url="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface" /> <params> - <param name="KILLTIMEOVERRIDE" value="59280"/> + <param name="INTERFACES" value="eth1"/> + <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/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"/> - <param name="ovsbridge1" value="DEVICE=ovsbridge1 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.1.21 NETMASK=255.255.255.0"/> - </params> - </task> - <task name="/distribution/get_task" role="STANDALONE"> + </task> + <task name="/kernel/networking/openvswitch/libvirt/add_interface" role="STANDALONE" id="2" status="Waiting"> + <fetch url="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> <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"/> </params> </task> - <task name="/distribution/virt/start" role="STANDALONE"> - <params/> - </task> - <task name="/distribution/get_task" role="STANDALONE"> + <task name="/kernel/networking/libvirt/netperf-client" role="STANDALONE" id="3" status="Waiting"> + <fetch url="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/ping"/> <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=""/> <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 invalid_addrs=192.168.1.3"/> @@ -194,11 +49,6 @@ <param name="rhel6u4_3" value="invalid_addrs=192.168.1.1;192.168.1.2 valid_addrs=192.168.1.3"/> </params> </task> - <task name="/distribution/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> - </task> </recipe> </recipeSet> </job> |