summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Burke <jburke@redhat.com>2009-04-09 20:58:30 +0000
committerJeff Burke <jburke@redhat.com>2009-04-09 20:58:30 +0000
commit6511a1d85ab2bb3c35d7b80cd3903e1ff49d4d37 (patch)
tree869d6e88868328fc42f04029f1cc718c24ff2830
parent47282ca77b8fa9fc32d104c7862b45700af28ebc (diff)
Update test to work with both old and new rhts/beakerrh-tests-distribution-reservesys-2_0-34
-rwxr-xr-xTasks/distribution/reservesys/runtest.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/Tasks/distribution/reservesys/runtest.sh b/Tasks/distribution/reservesys/runtest.sh
index f4d1cfd..5808ccd 100755
--- a/Tasks/distribution/reservesys/runtest.sh
+++ b/Tasks/distribution/reservesys/runtest.sh
@@ -44,16 +44,19 @@ MOTD()
echo " " >> $FILE
echo " You should verify the watchdog was update succesfully after " >> $FILE
echo " you extend your reservation. " >> $FILE
- echo " http://$LAB_SERVER/cgi-bin/rhts/watchdog.cgi " >> $FILE
+ echo " http://$RESULT_SERVER/cgi-bin/rhts/watchdog.cgi " >> $FILE
echo " " >> $FILE
echo " For ssh, kvm, serial and power control operations please look here: " >> $FILE
- echo " http://$LAB_SERVER/cgi-bin/rhts/systems.cgi?fqdn=$HOSTNAME " >> $FILE
+ if [ -z "$LAB_SERVER" ]; then
+ echo " https://inventory.engineering.redhat.com/view/$HOSTNAME " >> $FILE
+ else
+ echo " http://$LAB_SERVER/cgi-bin/rhts/systems.cgi?fqdn=$HOSTNAME " >> $FILE
+ fi
echo " " >> $FILE
echo " RHTS Test information: " >> $FILE
echo " HOSTNAME=$HOSTNAME " >> $FILE
echo " JOBID=$JOBID " >> $FILE
echo " RECIPEID=$RECIPEID " >> $FILE
- echo " LAB_SERVER=$LAB_SERVER " >> $FILE
echo " RESULT_SERVER=$RESULT_SERVER " >> $FILE
echo " DISTRO=$DISTRO " >> $FILE
echo " ARCHITECTURE=$ARCH " >> $FILE
@@ -153,7 +156,7 @@ NOTIFY()
WATCHDOG()
{
- rhts-test-checkin $LAB_SERVER $HOSTNAME $JOBID $TEST $ARCH $SLEEPTIME $TESTID
+ rhts-test-checkin $RESULT_SERVER $HOSTNAME $JOBID $TEST $SLEEPTIME $TESTID
}
if [ -z "$RESERVETIME" ]; then