Skip to content

[skip ci] Fix tar extraction path in DRS-disabled nightlies #7889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anchal-agrawal merged 1 commit into from
May 3, 2018
Merged

[skip ci] Fix tar extraction path in DRS-disabled nightlies #7889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/drs-disabled/jenkins-drs-disabled-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ 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"
break
else
echo "tar extraction failed"
canContinue="No"
rm -rf bin
rm -rf vic/bin
fi
n=$[$n+1]
sleep 15
Expand Down Expand Up @@ -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