summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2013-04-09 18:02:07 -0400
committerBill Peck <bpeck@redhat.com>2013-04-09 18:02:07 -0400
commit8c12cef5495df211c24355cf6b91508209606232 (patch)
treecb341d9865b8bf2338ac2c5d03a2e5fa601432fd
parent1e14edef706b91e1c92480b73beec2929e505a47 (diff)
downloadtests-8c12cef5495df211c24355cf6b91508209606232.tar.gz
tests-8c12cef5495df211c24355cf6b91508209606232.tar.xz
tests-8c12cef5495df211c24355cf6b91508209606232.zip
Have I guessed the magic rpm variable yet?
-rw-r--r--kernel/kernelinstall/all-rhel-all-arches.xml4
-rw-r--r--kernel/kernelinstall/fedora18.xml168
-rwxr-xr-xkernel/kernelinstall/runtest.sh2
3 files changed, 171 insertions, 3 deletions
diff --git a/kernel/kernelinstall/all-rhel-all-arches.xml b/kernel/kernelinstall/all-rhel-all-arches.xml
index f1d80c1..9d0a090 100644
--- a/kernel/kernelinstall/all-rhel-all-arches.xml
+++ b/kernel/kernelinstall/all-rhel-all-arches.xml
@@ -22,7 +22,7 @@
<params>
<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/kernelinstall"/>
<param name="KERNELARGNAME" value="kernel"/>
- <param name="KERNELARGVERSION" value="2.4.21-50.EL"/>
+ <param name="KERNELARGVERSION" value="2.4.21-50.ELsmp"/>
<param name="KERNELARGVARIANT" value="up"/>
</params>
</task>
@@ -184,7 +184,7 @@
<params>
<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/kernelinstall"/>
<param name="KERNELARGNAME" value="kernel"/>
- <param name="KERNELARGVERSION" value="2.6.9-100.EL"/>
+ <param name="KERNELARGVERSION" value="2.6.9-100.ELsmp"/>
<param name="KERNELARGVARIANT" value="up"/>
</params>
</task>
diff --git a/kernel/kernelinstall/fedora18.xml b/kernel/kernelinstall/fedora18.xml
new file mode 100644
index 0000000..632f8c0
--- /dev/null
+++ b/kernel/kernelinstall/fedora18.xml
@@ -0,0 +1,168 @@
+<job retention_tag="Scratch">
+ <whiteboard>
+ KernelInstall verification
+ </whiteboard>
+ <recipeSet priority="Normal">
+ <recipe ks_meta="method=nfs" whiteboard="">
+ <distroRequires>
+ <and>
+ <distro_family op="=" value="Fedora18"/>
+ <distro_name op="=" value="Fedora-18"/>
+ <distro_arch op="=" value="i386"/>
+ </and>
+ </distroRequires>
+ <hostRequires>
+ <and/>
+ </hostRequires>
+ <repos/>
+ <partitions/>
+ <task name="/distribution/install" 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/kernelinstall"/>
+ <param name="KERNELARGNAME" value="kernel"/>
+ <param name="KERNELARGVERSION" value="3.8.5-201.fc18"/>
+ <param name="KERNELARGVARIANT" value="up"/>
+ </params>
+ </task>
+ </recipe>
+ </recipeSet>
+ <recipeSet priority="Normal">
+ <recipe ks_meta="method=nfs" whiteboard="">
+ <distroRequires>
+ <and>
+ <distro_family op="=" value="Fedora18"/>
+ <distro_name op="=" value="Fedora-18"/>
+ <distro_arch op="=" value="x86_64"/>
+ </and>
+ </distroRequires>
+ <hostRequires>
+ <and/>
+ </hostRequires>
+ <repos/>
+ <partitions/>
+ <task name="/distribution/install" 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/kernelinstall"/>
+ <param name="KERNELARGNAME" value="kernel"/>
+ <param name="KERNELARGVERSION" value="3.8.5-201.fc18"/>
+ <param name="KERNELARGVARIANT" value="up"/>
+ </params>
+ </task>
+ </recipe>
+ </recipeSet>
+ <recipeSet priority="Normal">
+ <recipe ks_meta="method=nfs" whiteboard="">
+ <distroRequires>
+ <and>
+ <distro_family op="=" value="Fedora18"/>
+ <distro_name op="=" value="Fedora-18"/>
+ <distro_arch op="=" value="ppc64"/>
+ </and>
+ </distroRequires>
+ <hostRequires>
+ <and/>
+ </hostRequires>
+ <repos/>
+ <partitions/>
+ <task name="/distribution/install" 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/kernelinstall"/>
+ <param name="KERNELARGNAME" value="kernel"/>
+ <param name="KERNELARGVERSION" value="3.8.5-201.fc18"/>
+ <param name="KERNELARGVARIANT" value="up"/>
+ </params>
+ </task>
+ </recipe>
+ </recipeSet>
+ <recipeSet priority="Normal">
+ <recipe ks_meta="method=nfs" whiteboard="">
+ <distroRequires>
+ <and>
+ <distro_family op="=" value="Fedora18"/>
+ <distro_name op="=" value="Fedora-18"/>
+ <distro_arch op="=" value="s390x"/>
+ </and>
+ </distroRequires>
+ <hostRequires>
+ <and/>
+ </hostRequires>
+ <repos/>
+ <partitions/>
+ <task name="/distribution/install" 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/kernelinstall"/>
+ <param name="KERNELARGNAME" value="kernel"/>
+ <param name="KERNELARGVERSION" value="3.8.5-201.fc18"/>
+ <param name="KERNELARGVARIANT" value="up"/>
+ </params>
+ </task>
+ </recipe>
+ </recipeSet>
+ <recipeSet priority="Normal">
+ <recipe ks_meta="method=nfs" whiteboard="">
+ <distroRequires>
+ <and>
+ <distro_family op="=" value="Fedora18"/>
+ <distro_name op="=" value="Fedora-18"/>
+ <distro_arch op="=" value="armhfp"/>
+ </and>
+ </distroRequires>
+ <hostRequires>
+ <and/>
+ </hostRequires>
+ <repos/>
+ <partitions/>
+ <task name="/distribution/install" 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/kernelinstall"/>
+ <param name="KERNELARGNAME" value="kernel"/>
+ <param name="KERNELARGVERSION" value="3.8.5-201.fc18"/>
+ <param name="KERNELARGVARIANT" value="up"/>
+ </params>
+ </task>
+ </recipe>
+ </recipeSet>
+ <recipeSet priority="Normal">
+ <recipe ks_meta="method=nfs" whiteboard="">
+ <distroRequires>
+ <and>
+ <distro_family op="=" value="Fedora18"/>
+ <distro_name op="=" value="Fedora-18"/>
+ <distro_arch op="=" value="arm"/>
+ </and>
+ </distroRequires>
+ <hostRequires>
+ <and/>
+ </hostRequires>
+ <repos/>
+ <partitions/>
+ <task name="/distribution/install" 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/kernelinstall"/>
+ <param name="KERNELARGNAME" value="kernel"/>
+ <param name="KERNELARGVERSION" value="3.8.5-201.fc18"/>
+ <param name="KERNELARGVARIANT" value="up"/>
+ </params>
+ </task>
+ </recipe>
+ </recipeSet>
+</job>
+
diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh
index e4f8057..7cbd632 100755
--- a/kernel/kernelinstall/runtest.sh
+++ b/kernel/kernelinstall/runtest.sh
@@ -901,7 +901,7 @@ testver=$(rpm -qf $0)
DeBug "$testver"
# Current kernel variables
-runkernel=$(/bin/uname -r | sed -e "s/.$(rpm --eval '%{_target_cpu}')*.//g")
+runkernel=$(/bin/uname -r | sed -e "s/.$(rpm --eval '%{%__isa_name}')*.//g")
kernbase=$(rpm -q --queryformat '%{name}-%{version}-%{release}\n' -qf /boot/config-$(uname -r))
kername=$(rpm -q --queryformat '%{name}\n' -qf /boot/config-$(uname -r))
kernver=$(rpm -q --queryformat '%{version}\n' -qf /boot/config-$(uname -r))