From ee79ee8ed98a4ed37ad6231abb9c4e262e10115a Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 29 Jan 2019 09:26:55 -0800 Subject: [PATCH] Fix errors and intermittent failures in Android gradle builds in container --- android/containerized_build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android/containerized_build.sh b/android/containerized_build.sh index 42118a8e38..60d5c9db98 100755 --- a/android/containerized_build.sh +++ b/android/containerized_build.sh @@ -7,15 +7,12 @@ docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f docker/D # The Jenkins PR builds use VERSION_CODE, but the release builds use VERSION # So make sure we use VERSION_CODE consistently -if [-z "$VERSION_CODE"]; then - export VERSION_CODE=$VERSION -fi +test -z "$VERSION_CODE" && export VERSION_CODE=$VERSION docker run \ --rm \ --security-opt seccomp:unconfined \ -v "${WORKSPACE}":/home/jenkins/hifi \ - -v /home/jenkins/.gradle:/home/jenkins/.gradle \ -e RELEASE_NUMBER \ -e RELEASE_TYPE \ -e ANDROID_APP \