Skip to content

Commit

Permalink
Feature/add alibaba dragonwell (#99)
Browse files Browse the repository at this point in the history
* EPMLDI-1740: add basic Alibaba Dragonwell8 fallback implementation

* EPMLDI-1740: repository transport is not supported due to update from Alibaba Cloud Linux 2 (Aliyun Linux 2) YUM repository issues

* EPMLDI-1740: add verify playbook

* Change shape of instances to t3.micro

* Add ext ip for sapmachine

Signed-off-by: Timur Gadiev <[email protected]>
  • Loading branch information
dzmitryastrouski authored and tgadiev committed Nov 16, 2019
1 parent dbbb10b commit fbecfb0
Show file tree
Hide file tree
Showing 30 changed files with 308 additions and 109 deletions.
9 changes: 9 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,15 @@ AWS sapmachine-13:
tags:
- aws

AWS Alibaba Dragonwell8:
variables:
AWS_REGION: us-east-1
stage: deployment test
script:
- molecule test -s cloud-aws-dragonwell8
tags:
- aws

AZURE sapmachine-windows:
stage: deployment test
script:
Expand Down
26 changes: 25 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ This Ansible role has the following features for:
- Install JDK, JRE
- Additional opportunity to install from sapmachine-fallback, web, local source, chocolatey (only latest version), s3.

**Alibaba Dragonwell 8 JDK**

- Install JDK
- Alibaba Dragonwell 8 corresponds to OpenJDK 8 and is compatible with the Java SE Standard
- Linux/x86_64 platform only
- Additional opportunity to install from dragonwell8-fallback, web, local source, s3.

DISCLAIMER: usage of any version of this role implies you have accepted the
[Oracle Binary Code License Agreement for Java SE](http://www.oracle.com/technetwork/java/javase/terms/license/index.html).

Expand Down Expand Up @@ -114,6 +121,9 @@ Requirements
- Ubuntu bionic: sapmachine-fallback
- Debian stretch: sapmachine-fallback
- Windows: chocolatey (only latest version, don't support java_minor_version variables), sapmachine-fallback
- **Supported Alibaba Dragonwell version**:
- 8.0.0
- 8.1.1
- **Supported OS**:
- Ubuntu
- bionic
Expand All @@ -138,6 +148,7 @@ Requirements
- `zulu`
- `adoptopenjdk`
- `sapmachine`
- `dragonwell8`

**Notice**: this variable is mandatory in case of installing other distribution than 'openjdk'.

Expand All @@ -147,7 +158,7 @@ Requirements
- `jdk` (default)
- `jre`

- `transport` Artifact source transport. Use `openjdk-fallback`(OpenJDK only), `repositories`(OpenJDK only), `sapjvm-fallback`(SAPJVM only), `adoptopenjdk-fallback`(AdoptOpenJDK only),`sapmachine-fallback`(SapMachine only), `zulu-fallback`(ZULU only), `local`, `web` or `s3` for more predictable result.
- `transport` Artifact source transport. Use `openjdk-fallback`(OpenJDK only), `repositories`(OpenJDK only), `sapjvm-fallback`(SAPJVM only), `adoptopenjdk-fallback`(AdoptOpenJDK only),`sapmachine-fallback`(SapMachine only), `zulu-fallback`(ZULU only), `dragonwell8-fallback`(Alibaba Dragonwell only), `local`, `web` or `s3` for more predictable result.

Available:
- `repositories` Installing OpenJDK java from system repositories (yum or apt, Linux only)
Expand All @@ -159,6 +170,7 @@ Requirements
- `zulu-fallback` fetching artifact from AZUL site.
- `adoptopenjdk-fallback` fetching artifact from adoptopenjdk site.
- `sapmachine-fallback` fetching artifact from SapMachine site.
- `dragonwell8-fallback` fetching artifact from GitHub.
- `openjdk-fallback` fetching artifact from jdk.java.net.
This is default value for `transport` variable

Expand Down Expand Up @@ -345,6 +357,7 @@ https://docs.ansible.com/ansible/latest/modules/aws_s3_module.html#requirements
adoptopenjdk_impl: openj9
java_major_version: 8
```
### Installing SapMachine sapmachine-jre-10 from sapmachine-fallback:
```yaml
- name: Install SapMachine
Expand All @@ -357,6 +370,17 @@ https://docs.ansible.com/ansible/latest/modules/aws_s3_module.html#requirements
java_package: jre
java_major_version: 10
```
### Installing Alibaba Dragonwell 8 from dragonwell8-fallback:
```yaml
- name: Install Alibaba Dragonwell8
hosts: all

roles:
- role: lean_delivery.java
java_distribution: dragonwell8
transport: dragonwell8-fallback
java_major_version: 8
```
License
-------
Expand Down
3 changes: 3 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
# - sapjvm
# - zulu
# - adoptopenjdk (not supported 9/10)
# - alibaba_dragonwell (8 only)
# - sapmachine
java_distribution: openjdk

# OpenJDK tarball supported only jdk
# Oracle java supported jre/server-jre/jdk
# AdoptOpenJDK supported jdk/jre
# SapMachine supported jdk/jre
# Alibaba Dragonwell supported jdk only
java_package: jdk

# AdoptOpenJDK Implementation (hotspot/openj9)
Expand Down Expand Up @@ -49,6 +51,7 @@ transport: openjdk-fallback
# - "sapjvm-fallback" Install from artifact downloaded from SAP site
# - "zulu-fallback" Install from artifact downloaded from AZUL site
# - "sapmachine-fallback" Install from artifact downloaded from SapMachine site
# - "dragonwell-fallback" Install from artifact downloaded from GitHub site

transport_web: '{{ transport_web_default }}'
transport_local: "/tmp/openjdk-11.0.2_linux-x64_bin.tar.gz"
Expand Down
10 changes: 5 additions & 5 deletions molecule/cloud-aws-adoptopenjdk-11/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ platforms:
- name: test-aws-centos7-adoptopenjdk-hotspot-jre-tarball-11
image: ami-9887c6e7
platform: centos7
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -32,7 +32,7 @@ platforms:
- name: test-aws-ubuntu18-adoptopenjdk-openj9-jdk-tarball-11
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -51,7 +51,7 @@ platforms:
- name: test-aws-Debian9-adoptopenjdk-hotspot-jdk-repositories-11
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -70,7 +70,7 @@ platforms:
- name: test-aws-centos8-adoptopenjdk-openj9-jre-repositories-11
image: ami-0ed2ad9dc845b42b6
platform: centos8
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -89,7 +89,7 @@ platforms:
- name: test-aws-centos7-adoptopenjdk-local-11
image: ami-9887c6e7
platform: centos7
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand Down
12 changes: 6 additions & 6 deletions molecule/cloud-aws-adoptopenjdk-12/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ platforms:
- name: test-aws-centos8-adoptopenjdk-hotspot-jre-repositories-12
image: ami-0ed2ad9dc845b42b6
platform: centos8
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -33,7 +33,7 @@ platforms:
- name: test-aws-centos7-adoptopenjdk-openj9-jdk-tarball-12
image: ami-9887c6e7
platform: centos7
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -53,7 +53,7 @@ platforms:
- name: test-aws-Debian9-adoptopenjdk-openj9-jre-tarball-12
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -73,7 +73,7 @@ platforms:
- name: test-aws-ubuntu18-adoptopenjdk-hotspot-jdk-repositories-12
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -93,7 +93,7 @@ platforms:
- name: test-aws-Debian9-adoptopenjdk-hotspot-jre-repositories-12
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -114,7 +114,7 @@ platforms:
image: ami-003f19e0e687de1cd
profile_name: epmldi-instance-profile
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand Down
10 changes: 5 additions & 5 deletions molecule/cloud-aws-adoptopenjdk-8/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ platforms:
- name: test-aws-Debian9-adoptopenjdk-hotspot-jdk-tarball-8
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -32,7 +32,7 @@ platforms:
- name: test-aws-ubuntu18-adoptopenjdk-openj9-jre-tarball-8
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -51,7 +51,7 @@ platforms:
- name: test-aws-centos7-adoptopenjdk-hotspot-jdk-repositories-8
image: ami-9887c6e7
platform: centos7
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -70,7 +70,7 @@ platforms:
- name: test-aws-amazon2-adoptopenjdk-openj9-jre-repositories-8
image: ami-0b898040803850657
platform: amazon2
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -89,7 +89,7 @@ platforms:
- name: test-aws-ubuntu18-adoptopenjdk-web-8
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand Down
6 changes: 3 additions & 3 deletions molecule/cloud-aws-direct-11/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ platforms:
- name: test-aws-centos7-oracle_java-11-s3
image: ami-9887c6e7
platform: centos7
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -31,7 +31,7 @@ platforms:
- name: test-aws-ubuntu18-oracle_java-11-s3-deb
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -49,7 +49,7 @@ platforms:
- name: test-aws-Debian9-oracle_java-11-web-tb
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand Down
12 changes: 6 additions & 6 deletions molecule/cloud-aws-direct-12/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ platforms:
- name: test-aws-centos8-oracle_java-12-s3-rpm
image: ami-0ed2ad9dc845b42b6
platform: centos8
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -33,7 +33,7 @@ platforms:
- name: test-aws-centos7-oracle_java-12-s3-rpm
image: ami-9887c6e7
platform: centos7
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -53,7 +53,7 @@ platforms:
- name: test-aws-ubuntu18-oracle_java-12-s3-deb
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -72,7 +72,7 @@ platforms:
- name: test-aws-Debian9-oracle_java-12-s3-tb
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -91,7 +91,7 @@ platforms:
- name: test-aws-Amazon-oracle_java-12
image: ami-035b3c7efe6d061d5
platform: amazon
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand All @@ -111,7 +111,7 @@ platforms:
- name: test-aws-Amazon2-oracle_java-12
image: ami-0b898040803850657
platform: amazon2
instance_type: m5.large
instance_type: t3.micro
profile_name: epmldi-instance-profile
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
Expand Down
4 changes: 2 additions & 2 deletions molecule/cloud-aws-direct-6/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ platforms:
- name: test-aws-centos6-oracle_java-6-rpm
image: ami-1585c46a
platform: centos6
instance_type: t2.medium
instance_type: t2.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand All @@ -30,7 +30,7 @@ platforms:
- name: test-aws-ubuntu18-oracle_java-6-tarball
image: ami-012fd5eb46f56731f
platform: ubuntu18
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand Down
2 changes: 1 addition & 1 deletion molecule/cloud-aws-direct-7/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ platforms:
- name: test-aws-Debian9-oracle_java-7-tarball
image: ami-003f19e0e687de1cd
platform: debian9
instance_type: m5.large
instance_type: t3.micro
region: us-east-1
vpc_subnet_id: subnet-0f2b9cd66faea38af
assign_public_ip: false
Expand Down
Loading

0 comments on commit fbecfb0

Please sign in to comment.