summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-07-01 15:32:09 -0400
committerBill Peck <bpeck@redhat.com>2009-07-01 15:32:09 -0400
commit04770d66840be22861516b13142be10719b73e59 (patch)
tree90c004e2ccb3d794656753ea5645e0f63fb854e8
parentb2d5f04b96a92bd6310f84876bfb4a1e4b6d1182 (diff)
link Fedoradevelopment.ks to Fedora.ks and fix getVar in rhts_postbeaker-0_4_18
-rw-r--r--LabController/snippets/rhts_post2
-rw-r--r--beaker.spec6
2 files changed, 5 insertions, 3 deletions
diff --git a/LabController/snippets/rhts_post b/LabController/snippets/rhts_post
index 5dfe4c3..a2f6a59 100644
--- a/LabController/snippets/rhts_post
+++ b/LabController/snippets/rhts_post
@@ -95,7 +95,7 @@ yum -y install rhts-test-env-lab rhts-legacy
yum -y install yum-utils
# Get the RHTS job
-#if $get_var('runtest_url','') != ''
+#if $getVar('runtest_url','') != ''
wget -O /mnt/tests/runtests.sh http://$rhts_server/testlogs/$runtest_url
#else
wget -O /mnt/tests/runtests.sh http://$rhts_server/testlogs/recipes/$recipeid/runtests.sh
diff --git a/beaker.spec b/beaker.spec
index 6c7add4..ef5d9ae 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -3,7 +3,7 @@
Name: beaker
Version: 0.4.18
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Filesystem layout for Beaker
Group: Applications/Internet
License: GPLv2+
@@ -90,6 +90,7 @@ DESTDIR=$RPM_BUILD_ROOT make
%install
DESTDIR=$RPM_BUILD_ROOT make install
ln -s RedHatEnterpriseLinux6.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/redhat6.ks
+ln -s Fedora.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/Fedoradevelopment.ks
%clean
%{__rm} -rf %{buildroot}
@@ -132,8 +133,9 @@ ln -s RedHatEnterpriseLinux6.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/redha
/usr/share/man/man1/beakerlib*
%changelog
-* Wed Jul 01 2009 Bill Peck <bpeck@redhat.com> - 0.4.18-1
+* Wed Jul 01 2009 Bill Peck <bpeck@redhat.com> - 0.4.18-2
- Use RUNTEST_URL from rhts if passed.
+- Include Fedoradevelopment.ks for rawhide
* Tue Jun 30 2009 Bill Peck <bpeck@redhat.com> - 0.4.17-0
- Call the correct method for _tag
* Tue Jun 30 2009 Bill Peck <bpeck@redhat.com> - 0.4.16-0