summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-08-04 21:22:47 +0000
committerBill Peck <bpeck@redhat.com>2009-08-04 21:22:47 +0000
commit5d52fb550c22191727e82ee014aae6855b95d6e5 (patch)
treebda57b828de9b69caa454925eb4ea5685213cb30
parentd0001416913694d32d67c0b6ce5b493ca008111d (diff)
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh16
1 files changed, 15 insertions, 1 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index a50fa2a..4da87ed 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -318,9 +318,15 @@ function LabController()
mkdir -p /fakenet/${NFSSERVER}${NFSDIR}
mount ${NFSSERVER}:${NFSDIR} /fakenet/${NFSSERVER}${NFSDIR}
fi
+ echo cobbler import --path=/fakenet/${NFSSERVER}${NFSPATH} \
+ --name=${DISTRONAME}_nfs \
+ --available-as=nfs://${NFSSERVER}:${NFSPATH}
cobbler import --path=/fakenet/${NFSSERVER}${NFSPATH} \
--name=${DISTRONAME}_nfs \
--available-as=nfs://${NFSSERVER}:${NFSPATH}
+ echo cobbler import --path=/fakenet/${NFSSERVER}${NFSPATH} \
+ --name=${DISTRONAME}_http \
+ --available-as=http://${HOSTNAME}/fakenet/${NFSSERVER}${NFSPATH}
cobbler import --path=/fakenet/${NFSSERVER}${NFSPATH} \
--name=${DISTRONAME}_http \
--available-as=http://${HOSTNAME}/fakenet/${NFSSERVER}${NFSPATH}
@@ -335,16 +341,24 @@ function LabController()
for distro in $(find /fakenet/${NFSSERVER}${NFSDIR} -maxdepth 1 -name rawhide\* -type d); do
DISTRO=$(basename $distro)
DISTRONAME=Fedora-$(basename $distro)
+ echo cobbler import \
+ --path=/fakenet/${NFSSERVER}${NFSDIR}/${DISTRO} \
+ --name=${DISTRONAME}_nfs \
+ --available-as=nfs://${NFSSERVER}:${NFSDIR}/${DISTRO}
cobbler import --path=/fakenet/${NFSSERVER}${NFSDIR}/${DISTRO} \
--name=${DISTRONAME}_nfs \
--available-as=nfs://${NFSSERVER}:${NFSDIR}/${DISTRO}
+ echo cobbler import \
+ --path=/fakenet/${NFSSERVER}${NFSDIR}/${DISTRO} \
+ --name=${DISTRONAME}_http \
+ --available-as=http://${HOSTNAME}/fakenet/${NFSSERVER}${NFSDIR}/${DISTRO}
cobbler import --path=/fakenet/${NFSSERVER}${NFSDIR}/${DISTRO} \
--name=${DISTRONAME}_http \
--available-as=http://${HOSTNAME}/fakenet/${NFSSERVER}${NFSDIR}/${DISTRO}
report_result $TEST/ADD_DISTRO/$DISTRONAME PASS $?
done
fi
- cobbler distro report | tee -a $OUTPUTFILE
+ cobbler distro report
/var/lib/cobbler/triggers/sync/post/osversion.trigger | tee -a $OUTPUTFILE
estatus_fail "**** Failed to run osversion.trigger ****"
rhts-sync-set -s DONE