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.
This commit is contained in:
parent
0aabf89420
commit
ca295506c5
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user