Skip to content

Commit dab7ad5

Browse files
sorobonsorobon
authored
Merge pull request #213 from idealista/develop
Develop
2 parents 492a067 + fb1a617 commit dab7ad5

33 files changed

Lines changed: 294 additions & 67 deletions

‎.travis.yml‎

Lines changed: 61 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dist: bionic
1+
dist: jammy
22
language: python
33
python: 3.9
44
sudo: required
@@ -14,19 +14,31 @@ env:
1414
- secure: Iw1sHxmjqF6LPywwMPqbogZ47ZnSWPEDq8k71iqKfao0mDtLMUcmF2yIMLC0MQg1akaBKeHBS4MBQVBaGJDz++rgByzVpHwM0S0ZwUiO2ffVQE4uI+JSEMc1R34/5QPkYsg0FSIDVsCZZ9VnRLKh3GnVHlUljwwfVX5UX0g8RDEHxgdYSGGdAt8iUlQ3/YPSkvuKuNPWHtXCM0tkRYByUVUugSwUuo3rolYVv/S8AcrDf9qhHNkrp4zglC31wurq3M0yjmwHnShl+bLj2lV+QAenmFfjAZWlZ3DxARnSWSlFHMT3PGGWHYpFr2BN/na9ZQqmbWcR8k8XKFv6O205M+Zqao1zvzEpWVZBBiBJwYEVekQk1CzpVQ73sitYLHnmPNK5+W4939dNCkKocNhDf/bJTtaU/JlA64418N4hdjBsXTRfhzAILYJ0ba6a8Qnh5Xeuu3EZlRx6JepYEzy5dJel11MgDNVvaC8r9plCYtfo2ew1OH5QcDqCeaU+hTuXB02tNDWQoXP+aInF4JFqxWuEOlpGZeI3lXKNyHADaNBfziwWwtmBqHKhiLn7a8RJSSrVHRY0LS2YfAi5h4R3YwORlPr9E3I8Sgss21X1D2ocOMjZ4Qdfo5/eteUmEqq3yZBzeynrUwoSR7NYzllVWXMLMOoda2kckXNGaD5U7Es=
1515
jobs:
1616
# Java 8
17-
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3
18-
DOCKER_TAG_TO_PUBLISH=8u292-bullseye-adoptopenjdk-headless
19-
- DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3
20-
DOCKER_TAG_TO_PUBLISH=8u292-buster-adoptopenjdk-headless
17+
- DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
18+
DOCKER_TAG_TO_PUBLISH=8u382-bookworm-temurin-jdk
19+
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
20+
DOCKER_TAG_TO_PUBLISH=8u382-bullseye-temurin-jdk
21+
- DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
22+
DOCKER_TAG_TO_PUBLISH=8u382-buster-temurin-jdk
23+
- DOCKER_IMAGE_BASE=debian:stretch-slim JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.322.0.0+6-1
24+
DOCKER_TAG_TO_PUBLISH=8u322-buster-temurin-jdk
2125

22-
- DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u352-ga-1~18.04
23-
DOCKER_TAG_TO_PUBLISH=8u352-bionic-openjdk-headless
24-
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u352-ga-1~20.04
25-
DOCKER_TAG_TO_PUBLISH=8u342-focal-openjdk-headless
26+
- DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 DOCKER_TAG_TO_PUBLISH=8-stretch-openjdk-headless
2627

27-
- DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_VENDOR=adoptopenjdk JDK_MAJOR=8
28-
JDK_VERSION=8u292_b10 DOCKER_TAG_TO_PUBLISH=8u292-centos8-adoptopenjdk-headless
28+
- DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u372-ga~us1-0ubuntu1~18.04
29+
DOCKER_TAG_TO_PUBLISH=8u372-bionic-openjdk-headless
30+
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u382-ga-1~20.04.1
31+
DOCKER_TAG_TO_PUBLISH=8u382-focal-openjdk-headless
32+
- DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=8 JDK_VERSION=8u382-ga-1~22.04.1
33+
DOCKER_TAG_TO_PUBLISH=8u382-jammy-openjdk-headless
2934

35+
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
36+
DOCKER_TAG_TO_PUBLISH=8u382-focal-temurin-jdk
37+
- DOCKER_IMAGE_BASE=ubuntu:jammy JDK_VENDOR=temurin JDK_MAJOR=8 JDK_VERSION=8.0.382.0.0+5
38+
DOCKER_TAG_TO_PUBLISH=8u382-jammy-temurin-jdk
39+
40+
- DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
41+
DOCKER_TAG_TO_PUBLISH=8u302-bookworm-corretto-headless
3042
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
3143
DOCKER_TAG_TO_PUBLISH=8u302-bullseye-corretto-headless
3244
- DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
@@ -41,14 +53,29 @@ env:
4153
- DOCKER_IMAGE_BASE=debian:bullseye-slim DOCKER_TAG_TO_PUBLISH=11-bullseye-openjdk-headless
4254
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=11 JDK_VERSION=11.0.18+10-1~deb11u1
4355
DOCKER_TAG_TO_PUBLISH=11.0.18-bullseye-openjdk-headless
56+
- DOCKER_IMAGE_BASE=debian:bookworm-slim DOCKER_TAG_TO_PUBLISH=11-bookworm-openjdk-headless
4457

45-
- DOCKER_IMAGE_BASE=ubuntu:bionic DOCKER_TAG_TO_PUBLISH=11-bionic-openjdk-headless
46-
- DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.17+8-1ubuntu2~18.04
47-
DOCKER_TAG_TO_PUBLISH=11.0.17-bionic-openjdk-headless
58+
- DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
59+
DOCKER_TAG_TO_PUBLISH=11.0.20-buster-temurin-jdk
60+
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
61+
DOCKER_TAG_TO_PUBLISH=11.0.20-bullseye-temurin-jdk
62+
- DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
63+
DOCKER_TAG_TO_PUBLISH=11.0.20-bookworm-temurin-jdk
4864

65+
- DOCKER_IMAGE_BASE=ubuntu:bionic DOCKER_TAG_TO_PUBLISH=11-bionic-openjdk-headless
66+
- DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.19+7~us1-0ubuntu1~18.04.1
67+
DOCKER_TAG_TO_PUBLISH=11.0.19-bionic-openjdk-headless
4968
- DOCKER_IMAGE_BASE=ubuntu:focal DOCKER_TAG_TO_PUBLISH=11-focal-openjdk-headless
50-
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=11 JDK_VERSION=11.0.17+8-1ubuntu2~20.04
51-
DOCKER_TAG_TO_PUBLISH=11.0.17-focal-openjdk-headless
69+
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=11 JDK_VERSION=11.0.20+8-1ubuntu1~20.04
70+
DOCKER_TAG_TO_PUBLISH=11.0.20-focal-openjdk-headless
71+
- DOCKER_IMAGE_BASE=ubuntu:jammy DOCKER_TAG_TO_PUBLISH=11-jammy-openjdk-headless
72+
- DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=11 JDK_VERSION=11.0.20+8-1ubuntu1~22.04
73+
DOCKER_TAG_TO_PUBLISH=11.0.20-jammy-openjdk-headless
74+
75+
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
76+
DOCKER_TAG_TO_PUBLISH=11.0.20-focal-temurin-jdk
77+
- DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=11 JDK_VENDOR=temurin JDK_VERSION=11.0.20.0.0+8
78+
DOCKER_TAG_TO_PUBLISH=11.0.20-jammy-temurin-jdk
5279

5380
- DOCKER_IMAGE_BASE=centos:7 JDK_MAJOR=11 JDK_VERSION=11.0.12.0.7 DOCKER_TAG_TO_PUBLISH=11.0.12.0.7-centos7-openjdk-headless
5481
- DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_MAJOR=11 JDK_VERSION=11.0.13.0.8
@@ -59,12 +86,26 @@ env:
5986

6087
# Java 17
6188
- DOCKER_IMAGE_BASE=debian:bullseye-slim DOCKER_TAG_TO_PUBLISH=17-bullseye-openjdk-headless
62-
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=17 JDK_VERSION=17.0.6+10-1~deb11u1
63-
DOCKER_TAG_TO_PUBLISH=17.0.6-bullseye-openjdk-headless
89+
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=17 JDK_VERSION=17.0.7+7-1~deb11u1
90+
DOCKER_TAG_TO_PUBLISH=17.0.7-bullseye-openjdk-headless
91+
- DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_MAJOR=17 JDK_VERSION=17.0.8+7-1~deb12u1
92+
DOCKER_TAG_TO_PUBLISH=17.0.8-bookworm-openjdk-headless
93+
94+
- DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
95+
DOCKER_TAG_TO_PUBLISH=17.0.8-bullseye-temurin-jdk
96+
- DOCKER_IMAGE_BASE=debian:bookworm-slim JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
97+
DOCKER_TAG_TO_PUBLISH=17.0.8-bookworm-temurin-jdk
6498

6599
- DOCKER_IMAGE_BASE=ubuntu:focal DOCKER_TAG_TO_PUBLISH=17-focal-openjdk-headless
66-
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VERSION=17.0.5+8-2ubuntu1~20.04
67-
DOCKER_TAG_TO_PUBLISH=17.0.5-focal-openjdk-headless
100+
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VERSION=17.0.8+7-1~20.04.2
101+
DOCKER_TAG_TO_PUBLISH=17.0.8-focal-openjdk-headless
102+
- DOCKER_IMAGE_BASE=ubuntu:jammy DOCKER_TAG_TO_PUBLISH=17-jammy-openjdk-headless
103+
- DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=17 JDK_VERSION=17.0.8+7-1~22.04
104+
DOCKER_TAG_TO_PUBLISH=17.0.8-jammy-openjdk-headless
105+
- DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
106+
DOCKER_TAG_TO_PUBLISH=17.0.8-focal-temurin-jdk
107+
- DOCKER_IMAGE_BASE=ubuntu:jammy JDK_MAJOR=17 JDK_VENDOR=temurin JDK_VERSION=17.0.8.0.0+7
108+
DOCKER_TAG_TO_PUBLISH=17.0.8-jammy-temurin-jdk
68109

69110
script:
70111
- pipenv run molecule test --scenario-name=${JDK_VENDOR:-default}

‎.yamllint‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ rules:
1212
# NOTE(retr0h): Templates no longer fail this lint rule.
1313
# Uncomment if running old Molecule templates.
1414
# truthy: disable
15-
1615
ignore: |
1716
tests/
1817
.travis.yml

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
44

55
## [Unreleased](https://github.com/idealista/java_role/tree/develop)
66

7+
## [9.0.0](https://github.com/idealista/java_role/tree/9.0.0) (2023-08-16)
8+
### Added
9+
- *[#210](https://github.com/idealista/java_role/issues/210) Temurin support* @sorobon
10+
- *[#210](https://github.com/idealista/java_role/issues/210) Debian 12 support* @sorobon
11+
- *[#210](https://github.com/idealista/java_role/issues/210) Remove deprecated repositories* @sorobon
12+
### Removed
13+
- *[#210](https://github.com/idealista/java_role/issues/210) Removed adoptopenjdk* @sorobon
14+
715
## [8.1.0](https://github.com/idealista/java_role/tree/8.1.0) (2023-06-22)
816
### Added
917
- *[#207](https://github.com/idealista/java_role/issues/207) Add support for import SSL certificates into Java's truststore* @emepege

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,25 @@ Debian Stretch | `11`
108108
Debian Buster | `11` (default)
109109
Debian Bullseye | `17`
110110
Debian Bullseye | `11` (default)
111+
Debian Bookworm | `17`
112+
Debian Bookworm | `17` (default)
111113
Ubuntu Xenial | `8`
112114
Ubuntu Xenial | `9` (default)
113115
Ubuntu Bionic | `8`
114116
Ubuntu Bionic | `11` (default)
115117
Ubuntu Focal | `8`
116118
Ubuntu Focal | `11`
117-
Ubuntu Focal | `13`
118-
Ubuntu Focal | `14` (default)
119+
Ubuntu Focal | `17` (default)
120+
Ubuntu Jammy | `11`
121+
Ubuntu Jammy | `17` (default)
119122
CentOS 7 | `1.6.0`
120123
CentOS 7 | `1.7.0`
121124
CentOS 7 | `1.8.0`
122125
CentOS 7 | `11` (default)
123126
CentOS 8 | `1.8.0`
124127
CentOS 8 | `11` (default)
125128

126-
Other OpenJDK implementations out of GNU/Linux distributions streams are not officially supported, but it's easy use this role too adding extra repositories (see vars/ in AdoptOpenJDK and Corretto directories).
129+
Other OpenJDK implementations out of GNU/Linux distributions streams are not officially supported, but it's easy use this role too adding extra repositories (see vars/ in AdoptOpenJDK/Temurin and Corretto directories).
127130

128131
### Adding certificates into Java's truststore
129132

‎meta/main.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ galaxy_info:
99
platforms:
1010
- name: Debian
1111
versions:
12+
- stretch
1213
- buster
1314
- bullseye
15+
- bookworm
1416
- name: Ubuntu
1517
versions:
1618
- bionic

‎molecule/adoptopenjdk/Dockerfile.j2‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎molecule/default/Dockerfile.j2‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ FROM {{ item.image }}
99
RUN mkdir -p /usr/share/man/man1
1010
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
1111

12+
{% if 'stretch' in item.image %}
13+
RUN echo "deb http://archive.debian.org/debian/ stretch contrib main non-free" > /etc/apt/sources.list && \
14+
echo "deb-src http://archive.debian.org/debian/ stretch contrib main non-free" >> /etc/apt/sources.list && \
15+
echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
16+
echo "deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
17+
echo "deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
18+
echo "deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
19+
echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
20+
echo "deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
21+
apt-get update
22+
{% endif %}
23+
1224
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; \
1325
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
1426
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; \

‎molecule/temurin/Dockerfile.j2‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Molecule managed
2+
3+
{% if item.registry is defined %}
4+
FROM {{ item.registry.url }}/{{ item.image }}
5+
{% else %}
6+
FROM {{ item.image }}
7+
{% endif %}
8+
9+
RUN mkdir -p /usr/share/man/man1
10+
11+
{% if 'stretch' in item.image %}
12+
RUN echo "deb http://archive.debian.org/debian/ stretch contrib main non-free" > /etc/apt/sources.list && \
13+
echo "deb-src http://archive.debian.org/debian/ stretch contrib main non-free" >> /etc/apt/sources.list && \
14+
echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
15+
echo "deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
16+
echo "deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
17+
echo "deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
18+
echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
19+
echo "deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \
20+
apt-get update
21+
{% endif %}
22+
23+
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; \
24+
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
25+
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; \
26+
elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
27+
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi

molecule/adoptopenjdk/converge.yml renamed to molecule/temurin/converge.yml

File renamed without changes.

molecule/adoptopenjdk/molecule.yml renamed to molecule/temurin/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lint: |
99
ansible-lint .
1010
1111
platforms:
12-
- name: openjdk-adopt-test
12+
- name: temurin-test
1313
groups:
1414
- openjdk
1515
image: ${DOCKER_IMAGE_BASE:-debian:buster-slim}
@@ -25,6 +25,6 @@ provisioner:
2525
java_open_jdk_version_major: ${JDK_MAJOR}
2626

2727
scenario:
28-
name: adoptopenjdk
28+
name: temurin
2929
verifier:
3030
name: ansible

0 commit comments

Comments
 (0)