#210 - Migrate to Adoptium temurin. Added stretch support

Author: sorobon

Diff for: .travis.yml

@@ -20,6 +20,10 @@ env:
     DOCKER_TAG_TO_PUBLISH=8u382-bullseye-temurin-jdk
   - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
     DOCKER_TAG_TO_PUBLISH=8u382-buster-temurin-jdk
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.322.0.0+6-1
+    DOCKER_TAG_TO_PUBLISH=8u322-buster-temurin-jdk
+
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 DOCKER_TAG_TO_PUBLISH=8-stretch-openjdk-headless
 
   - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u372-ga~us1-0ubuntu1~18.04
     DOCKER_TAG_TO_PUBLISH=8u372-bionic-openjdk-headless

Diff for: meta/main.yml

@@ -9,6 +9,7 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
+        - stretch
         - buster
         - bullseye
         - bookworm

Diff for: molecule/adoptopenjdk/Dockerfile.j2

@@ -9,6 +9,18 @@ FROM {{ item.image }}
 RUN mkdir -p /usr/share/man/man1
 RUN if [ $(command -v apt-get) ]; then sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' /etc/apt/apt.conf.d/docker-clean; fi
 
+{% if 'stretch' in item.image %}
+RUN echo "deb http://archive.debian.org/debian/ stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch contrib main non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    apt-get update
+{% endif %}
+
 RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \

Diff for: molecule/adoptopenjdk/converge.yml

@@ -8,6 +8,18 @@ FROM {{ item.image }}
 
 RUN mkdir -p /usr/share/man/man1
 
+{% if 'stretch' in item.image %}
+RUN echo "deb http://archive.debian.org/debian/ stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch contrib main non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
+    apt-get update
+{% endif %}
+
 RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \

Diff for: molecule/adoptopenjdk/molecule.yml

@@ -0,0 +1,13 @@
+---
+
+# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
+__java_open_jdk_version_major: 11
+__java_keystore_dir: lib/security
+# Supported openjdk major releases: 11
+
+__java_required_repositories_openjdk: "deb http://archive.debian.org/debian stretch-backports main"
+__java_required_libs_openjdk: []
+__java_required_key_repositories_openjdk: []
+
+__java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
+__java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}

Diff for: molecule/adoptopenjdk/tests/test_openjdk.yml

@@ -0,0 +1,17 @@
+---
+java_open_jdk_apt_extra_packages:
+  - python-apt
+  - apt-transport-https
+__java_open_jdk_version_major: 8
+__java_keystore_dir: jre/lib/security
+# Supported major releases: 8 and from 11 to 14; hotspot and openj9 implementations
+
+# For Debian family
+__java_required_libs_openjdk: []
+
+__java_required_key_repositories_openjdk:
+  - https://packages.adoptium.net/artifactory/api/gpg/key/public
+__java_required_repositories_openjdk:
+  - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
+__java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
+__java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk