From: DW Talton <dtalton@contractor.linuxfoundation.org>
Date: Tue, 20 Aug 2019 17:27:27 +0000 (-0700)
Subject: JDK update to 11
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=9096bc568bc7ac18672aff087020b3a630b79543;p=releng%2Fci-workshop.git

JDK update to 11

The underlying containers for ci-workshop have
updated to debian 10, which no longer includes
java 8. Bumped the version to 11. Also, added
python-wheel to the jenkins agent container as
Docker builds were failing without it.

Signed-off-by: DW Talton <dtalton@contractor.linuxfoundation.org>
Change-Id: Ia6607a1f89a39f9fd42dc12b41bd19407adb7da6
---

diff --git a/init/Dockerfile b/init/Dockerfile
index b8fdce0..893131d 100644
--- a/init/Dockerfile
+++ b/init/Dockerfile
@@ -13,7 +13,7 @@ ENV CI_SYSTEM=jenkins
 ENV ANSIBLE_STDOUT_CALLBACK=yaml
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -yq \
-  openjdk-8-jdk \
+  openjdk-11-jdk \
   python3-apt \
   && apt-get clean
 RUN pip install --no-cache-dir ansible docker-py
diff --git a/jenkins/agent/Dockerfile b/jenkins/agent/Dockerfile
index 8db4fc4..2010686 100644
--- a/jenkins/agent/Dockerfile
+++ b/jenkins/agent/Dockerfile
@@ -8,6 +8,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
        libffi-dev \
        libssl-dev \
        python \
+       python-wheel \
        python-pip \
        python-tox \
        python-dev \