summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2011-04-15 15:41:05 -0400
committerBill Peck <bpeck@redhat.com>2011-04-15 15:41:05 -0400
commit8075819fcf9c836ffbf13492bd38a76be26a5f8b (patch)
treebbda11ee5241c11e93fad00b5d7db9f4c024d5b0
parent3323192cdb3cff1500077739a562a04fa96c934d (diff)
Update beaker/setup to not import distros, do that in a seperate task.beaker-distribution-beaker-setup-1_1-62
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh55
1 files changed, 0 insertions, 55 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 11b4014..cc6902c 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -383,61 +383,6 @@ function LabController()
service beaker-proxy start
service beaker-watchdog start
service beaker-transfer start
- # Add some distros
- # NFS format HOSTNAME:DISTRONAME:NFSPATH
- if [ -z "$NFSDISTROS" ]; then
- echo "Missing NFS Distros to test with" | tee -a $OUTPUTFILE
- report_result $TEST Warn
- exit 1
- fi
- ln -s /fakenet /var/www/html/fakenet
- for distro in $NFSDISTROS; do
- NFSSERVER=$(echo $distro| awk -F: '{print $1}')
- DISTRONAME=$(echo $distro| awk -F: '{print $2}')
- NFSPATH=$(echo $distro| awk -F: '{print $3}')
- NFSDIR=$(dirname $NFSPATH)
- mkdir -p /fakenet/${NFSSERVER}${NFSDIR}
- mount ${NFSSERVER}:${NFSDIR} /fakenet/${NFSSERVER}${NFSDIR}
- result="FAIL"
- 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}
- score=$?
- if [ "$score" -eq "0" ]; then
- result="PASS"
- fi
- report_result $TEST/ADD_DISTRO/${DISTRONAME}_NFS $result $score
- done
- # Import Rawhide
- if [ -n "$RAWHIDE_NFS" ]; then
- NFSSERVER=$(echo $RAWHIDE_NFS| awk -F: '{print $1}')
- NFSDIR=$(echo $RAWHIDE_NFS| awk -F: '{print $2}')
- mkdir -p /fakenet/${NFSSERVER}${NFSDIR}
- mount ${NFSSERVER}:${NFSDIR} /fakenet/${NFSSERVER}${NFSDIR}
- for distro in $(find /fakenet/${NFSSERVER}${NFSDIR} -maxdepth 1 -name rawhide\* -type d); do
- DISTRO=$(basename $distro)
- DISTRONAME=Fedora-$(basename $distro)
- result="FAIL"
- 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}
- score=$?
- if [ "$score" -eq "0" ]; then
- result="PASS"
- fi
- report_result $TEST/ADD_DISTRO/${DISTRONAME}_NFS $result $score
- done
- fi
- 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
result_pass
}