From 0ffa3a417ef856260678f45e435a9a6ed5223f77 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Fri, 18 Mar 2016 17:03:55 +0100
Subject: [PATCH] MT#17213 Fix 3831f7: Revert testrunner changes which prevent
 fetching new goss file after NGCP upgrade

After upgrade new goss file is not downloaded (because old one exist)
while tests have new syntax for new NGCP version:
> 16:12:19 + ssh -t -t 192.168.23.138 'SKIP_STRICT_HOSTNAME_TEST=false      SKIP_DNS_CHECK_TEST=false      GOSS_NOCOLOR=true      /usr/share/ngcp-tests/testrunner ce'
> ...
> 16:12:23 2016-03-18 16:12:23: Generating /etc/ngcp-tests/pro/goss.json: OK
> 16:12:23 Error: json: cannot unmarshal number into Go value of type string

P.S. yes, we need package here with proper dependencies in system-tests

Change-Id: If22655f306582f2056810d75eeb55e19e96fdbdf
---
 testrunner | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testrunner b/testrunner
index 6c60c04..1b282c5 100755
--- a/testrunner
+++ b/testrunner
@@ -20,16 +20,16 @@ case "${TYPE}" in
   *) echo "ERRRO: Unknown type '$1'" >&2 ; usage >&2 ; exit 1 ;;
 esac
 
-if [ ! -x "/usr/sbin/goss" ] ; then
-  goss="goss-mika-git804995a8_with_tap_and_junit"
+goss="goss-mika-git804995a8_with_tap_and_junit"
 
+if [ ! -x "/usr/sbin/${goss}" ] ; then
   echo "Downloading goss and installing as /usr/sbin/${goss}"
   curl -L "https://deb.sipwise.com/files/${goss}" > "/usr/sbin/${goss}"
   chmod +x "/usr/sbin/${goss}"
-
-  ln -sf "/usr/sbin/${goss}" /usr/sbin/goss
 fi
 
+rm -f /usr/sbin/goss
+ln -s "/usr/sbin/${goss}" /usr/sbin/goss
 
 host_yml_file="/etc/ngcp-config/config.$(hostname).yml"
 if [ -n "${SKIP_DNS_CHECK_TEST}" ] || [ -n "${SKIP_STRICT_HOSTNAME_TEST}" ] ; then