From ca295506c5b812122b8bdd3dd6b4e6a6875ee1b7 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 12 May 2021 14:42:15 -0700 Subject: [PATCH] Make the dist_install test use Java 8 (#8609) This is necessary because the Kotlin support requires Java 8 or higher. Making this test use Java 8 required switching it to the java_stretch Docker image and updating that image to include some Python dependencies. --- kokoro/linux/dist_install/build.sh | 4 ++-- .../linux/dockerfile/test/java_stretch/Dockerfile | 13 ++++++------- tests.sh | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/kokoro/linux/dist_install/build.sh b/kokoro/linux/dist_install/build.sh index 81a0516aa845..c456ee81faa0 100755 --- a/kokoro/linux/dist_install/build.sh +++ b/kokoro/linux/dist_install/build.sh @@ -7,8 +7,8 @@ set -ex # exit immediately on error # Change to repo root cd $(dirname $0)/../../.. -# Run tests under release docker image. -export DOCKERFILE_DIR=kokoro/linux/64-bit +export DOCKERHUB_ORGANIZATION=protobuftesting +export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh export OUTPUT_DIR=testoutput export TEST_SET="dist_install" diff --git a/kokoro/linux/dockerfile/test/java_stretch/Dockerfile b/kokoro/linux/dockerfile/test/java_stretch/Dockerfile index fc5e82abdbb3..3e72046f477a 100644 --- a/kokoro/linux/dockerfile/test/java_stretch/Dockerfile +++ b/kokoro/linux/dockerfile/test/java_stretch/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stretch -# Install dependencies. We start with the basic ones require to build protoc +# Install dependencies. We start with the basic ones required to build protoc # and the C++ build RUN apt-get update && apt-get install -y \ autoconf \ @@ -20,12 +20,11 @@ RUN apt-get update && apt-get install -y \ parallel \ time \ wget \ - && apt-get clean - -# Java dependencies -RUN apt-get install -y \ - # -- For all Java builds -- \ + # Java dependencies maven \ - # -- For java_linkage_monitor \ openjdk-8-jdk \ + # Python dependencies + python-setuptools \ + python-pip \ + virtualenv \ && apt-get clean diff --git a/tests.sh b/tests.sh index e6369eb80d75..923201a8218a 100755 --- a/tests.sh +++ b/tests.sh @@ -104,7 +104,7 @@ build_dist_install() { # Try to install Java pushd java - use_java jdk7 + use_java jdk8 $MVN install popd