Skip to content

Commit

Permalink
Make the dist_install test use Java 8 (#8609)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
acozzette authored May 12, 2021
1 parent 0aabf89 commit ca29550
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions kokoro/linux/dist_install/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 6 additions & 7 deletions kokoro/linux/dockerfile/test/java_stretch/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
2 changes: 1 addition & 1 deletion tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ build_dist_install() {

# Try to install Java
pushd java
use_java jdk7
use_java jdk8
$MVN install
popd

Expand Down

0 comments on commit ca29550

Please sign in to comment.