From e7bbff57a262452fd9408967785024f6d62633a1 Mon Sep 17 00:00:00 2001
From: Anchal Agrawal <anchala@vmware.com>
Date: Thu, 3 May 2018 13:32:34 -0700
Subject: [PATCH] Fix tar extraction path in DRS-disabled nightlies

This change fixes the VIC tar extraction path in the
jenkins-drs-disabled-run.sh script. We were erroneously
extracting the binaries outside the vic/ directory, causing the
'Install VIC Appliance To Test Server' keyword to fail because it
couldn't locate the vic-machine binary in vic/bin.

Towards #7662
---
 tests/drs-disabled/jenkins-drs-disabled-run.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/drs-disabled/jenkins-drs-disabled-run.sh b/tests/drs-disabled/jenkins-drs-disabled-run.sh
index 442fbe3975..491d6332ae 100755
--- a/tests/drs-disabled/jenkins-drs-disabled-run.sh
+++ b/tests/drs-disabled/jenkins-drs-disabled-run.sh
@@ -35,10 +35,10 @@ n=0
 n=0
    until [ $n -ge 5 ]
    do
-      mkdir bin
+      mkdir vic/bin
       echo "Extracting .tar.gz"
-      tar xvzf $input -C bin/ --strip 1
-      if [ -f "bin/vic-machine-linux" ]
+      tar xvzf $input -C vic/bin --strip 1
+      if [ -f "vic/bin/vic-machine-linux" ]
       then
       echo "tar extraction complete.."
       canContinue="Yes"
@@ -46,7 +46,7 @@ n=0
       else
       echo "tar extraction failed"
       canContinue="No"
-      rm -rf bin
+      rm -rf vic/bin
       fi
       n=$[$n+1]
       sleep 15
@@ -77,5 +77,5 @@ sed -i -e 's|FAIL|<font color="red">FAIL</font>|g' console.log
 
 # Run the log upload script in a container
 cmd="tests/drs-disabled/upload-logs.sh"
-docker run --rm -v $PWD/vic:/go --env-file $envfile $image $cmd
+docker run --rm -e BUILD_TIMESTAMP -v $PWD/vic:/go --env-file $envfile $image $cmd