buildscripts: always keep mvn artifacts (#4372)

After searching for "artifacts retention policy" in the
kokoro-users group, I learned that there's a default 90 day
retention policy already in place.
This commit is contained in:
zpencer 2018-04-20 15:19:48 -07:00 committed by GitHub
parent c37ea15830
commit 48b7c62b43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 10 deletions

View File

@ -4,7 +4,7 @@
build_file: "grpc-java/buildscripts/kokoro/unix.sh" build_file: "grpc-java/buildscripts/kokoro/unix.sh"
timeout_mins: 45 timeout_mins: 45
# We always build artifacts, but we only copy them here when MVN_ARTIFACTS is set in unix.sh # We always build mvn artifacts.
action { action {
define_artifacts { define_artifacts {
regex: ["**/mvn-artifacts/**"] regex: ["**/mvn-artifacts/**"]

View File

@ -3,7 +3,6 @@
# This file is used for both Linux and MacOS builds. # This file is used for both Linux and MacOS builds.
# To run locally: # To run locally:
# ./buildscripts/kokoro/unix.sh # ./buildscripts/kokoro/unix.sh
# Optionally set MVN_ARTIFACTS=true to retain artifacts
# This script assumes `set -e`. Removing it may lead to undefined behavior. # This script assumes `set -e`. Removing it may lead to undefined behavior.
set -exu -o pipefail set -exu -o pipefail
@ -74,9 +73,6 @@ LOCAL_MVN_TEMP=$(mktemp -d)
./gradlew clean grpc-compiler:build grpc-compiler:uploadArchives $GRADLE_FLAGS -PtargetArch=x86_64 \ ./gradlew clean grpc-compiler:build grpc-compiler:uploadArchives $GRADLE_FLAGS -PtargetArch=x86_64 \
-Dorg.gradle.parallel=false -PrepositoryDir=$LOCAL_MVN_TEMP -Dorg.gradle.parallel=false -PrepositoryDir=$LOCAL_MVN_TEMP
if [[ -z "${MVN_ARTIFACTS:-}" ]]; then
exit 0
fi
MVN_ARTIFACT_DIR="$PWD/mvn-artifacts" MVN_ARTIFACT_DIR="$PWD/mvn-artifacts"
mkdir $MVN_ARTIFACT_DIR mkdir $MVN_ARTIFACT_DIR
mv $LOCAL_MVN_TEMP/* $MVN_ARTIFACT_DIR mv $LOCAL_MVN_TEMP/* $MVN_ARTIFACT_DIR

View File

@ -20,8 +20,6 @@ set PATH=C:\Program Files\java\jdk1.8.0_152\bin;%PATH%
cmd.exe /C "%WORKSPACE%\buildscripts\kokoro\windows32.bat" || exit /b 1 cmd.exe /C "%WORKSPACE%\buildscripts\kokoro\windows32.bat" || exit /b 1
cmd.exe /C "%WORKSPACE%\buildscripts\kokoro\windows64.bat" || exit /b 1 cmd.exe /C "%WORKSPACE%\buildscripts\kokoro\windows64.bat" || exit /b 1
IF DEFINED MVN_ARTIFACTS ( mkdir mvn-artifacts
mkdir mvn-artifacts move artifacts\x86_64 mvn-artifacts\x86_64
move artifacts\x86_64 mvn-artifacts\x86_64 move artifacts\x86_32 mvn-artifacts\x86_32
move artifacts\x86_32 mvn-artifacts\x86_32
)

View File

@ -3,6 +3,8 @@
# Location of the continuous shell script in repository. # Location of the continuous shell script in repository.
build_file: "grpc-java/buildscripts/kokoro/windows.bat" build_file: "grpc-java/buildscripts/kokoro/windows.bat"
timeout_mins: 45 timeout_mins: 45
# We always build mvn artifacts.
action { action {
define_artifacts { define_artifacts {
regex: ["**/build/test-results/**/*.xml", "**/mvn-artifacts/**"] regex: ["**/build/test-results/**/*.xml", "**/mvn-artifacts/**"]