Fix adopt win choco (#93)

* Test adoptopenjdk win 13 Signed-off-by: Timur Gadiev <[email protected]> * Change debug tasks Signed-off-by: Timur Gadiev <[email protected]> * Test updated regex Signed-off-by: Timur Gadiev <[email protected]> * Change adoptopenjdk_choco_folder Signed-off-by: Timur Gadiev <[email protected]> * Test java_package Signed-off-by: Timur Gadiev <[email protected]> * Enable all tests Signed-off-by: Timur Gadiev <[email protected]> * Updated test (shape m5) Signed-off-by: Timur Gadiev <[email protected]>
lean-delivery · Oct 6, 2019 · beb41b8 · beb41b8
1 parent f9310d3
commit beb41b8
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 68 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 ---
-dist: xenial
+dist: bionic
 sudo: required
 
 language: python
 python:
-  - "2.7"
+  - "3.7"
 
 services:
   - docker
@@ -13,8 +13,8 @@ before_install:
   - git clone https://github.com/lean-delivery/ansible-lint-rules.git ~/ansible-lint-rules
 
 install:
-  - pip install --upgrade ansible==2.8.* docker molecule==2.22
-  - pip install git+https://github.com/ansible/ansible-lint.git
+  - pip3 install --upgrade ansible==2.8.* docker molecule==2.22
+  - pip3 install git+https://github.com/ansible/ansible-lint.git
   - ansible --version
   - ansible-lint --version
 

diff --git a/README.md b/README.md
@@ -85,6 +85,7 @@ Requirements
    - 8
    - 11
    - 12
+   - 13
  - **Supported OS**:
    - Ubuntu
      - bionic
@@ -108,6 +109,8 @@ Requirements
      - `zulu`
      - `adoptopenjdk`
 
+        **Notice**: this variable is mandatory in case of installing other distribution than 'openjdk'.
+
   - `java_package` Java package type.
 
     Available:

diff --git a/meta/main.yml b/meta/main.yml
@@ -10,7 +10,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "trusty"
         - "xenial"
         - "bionic"
     - name: "Debian"
@@ -26,7 +25,8 @@ galaxy_info:
         - "Candidate"
     - name: "Windows"
       versions:
-        - "all"
+        - "2016"
+        - "2019"
 
   galaxy_tags:
     - "development"

diff --git a/molecule/cloud-aws-adoptopenjdk-11/molecule.yml b/molecule/cloud-aws-adoptopenjdk-11/molecule.yml
@@ -13,7 +13,7 @@ platforms:
   - name: test-aws-centos7-adoptopenjdk-hotspot-jre-tarball-11
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -32,7 +32,7 @@ platforms:
   - name: test-aws-ubuntu18-adoptopenjdk-openj9-jdk-tarball-11
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -51,7 +51,7 @@ platforms:
   - name: test-aws-Debian9-adoptopenjdk-hotspot-jdk-repositories-11
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -70,7 +70,7 @@ platforms:
   - name: test-aws-centos7-adoptopenjdk-openj9-jre-repositories-11
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -89,7 +89,7 @@ platforms:
   - name: test-aws-centos7-adoptopenjdk-local-11
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-adoptopenjdk-12/molecule.yml b/molecule/cloud-aws-adoptopenjdk-12/molecule.yml
@@ -13,7 +13,7 @@ platforms:
   - name: test-aws-centos7-adoptopenjdk-openj9-jdk-tarball-12
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -32,7 +32,7 @@ platforms:
   - name: test-aws-Debian9-adoptopenjdk-openj9-jre-tarball-12
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -51,7 +51,7 @@ platforms:
   - name: test-aws-ubuntu18-adoptopenjdk-hotspot-jdk-repositories-12
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -70,7 +70,7 @@ platforms:
   - name: test-aws-Debian9-adoptopenjdk-hotspot-jre-repositories-12
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -90,7 +90,7 @@ platforms:
     image: ami-003f19e0e687de1cd
     profile_name: epmldi-instance-profile
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-adoptopenjdk-8/molecule.yml b/molecule/cloud-aws-adoptopenjdk-8/molecule.yml
@@ -13,7 +13,7 @@ platforms:
   - name: test-aws-Debian9-adoptopenjdk-hotspot-jdk-tarball-8
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -32,7 +32,7 @@ platforms:
   - name: test-aws-ubuntu18-adoptopenjdk-openj9-jre-tarball-8
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -51,7 +51,7 @@ platforms:
   - name: test-aws-centos7-adoptopenjdk-hotspot-jdk-repositories-8
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -89,7 +89,7 @@ platforms:
   - name: test-aws-ubuntu18-adoptopenjdk-web-8
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-adoptopenjdk-windows/molecule.yml b/molecule/cloud-aws-adoptopenjdk-windows/molecule.yml
@@ -10,11 +10,11 @@ lint:
   options:
     config-file: .yamllint
 platforms:
-  - name: test-aws-windows2016-adoptopenjdk-tarball-12
+  - name: test-aws-windows2016-adoptopenjdk-tarball-13
     aws_image_id: ami-00a20f508263efd30
     platform: windows2016core
     aws_region: us-east-1
-    instance_type: m5a.large
+    instance_type: m5.large
     assign_public_ip: false
     spot_price: 0.14
     aws_sec_group:
@@ -27,11 +27,11 @@ platforms:
       - jdk
       - adoptopenjdk_fallback
 
-  - name: test-aws-windows2019-adoptopenjdk-tarball-12
+  - name: test-aws-windows2019-adoptopenjdk-tarball-13
     aws_image_id: ami-0477b9335a5a75438
     platform: windows2019core
     aws_region: us-east-1
-    instance_type: m5a.large
+    instance_type: m5.large
     assign_public_ip: false
     spot_price: 0.14
     aws_sec_group:
@@ -44,11 +44,11 @@ platforms:
       - jre
       - adoptopenjdk_fallback
 
-  - name: test-aws-windows2016-adoptopenjdk-chocolatey-12
+  - name: test-aws-windows2016-adoptopenjdk-chocolatey-13
     aws_image_id: ami-00a20f508263efd30
     platform: windows2016core
     aws_region: us-east-1
-    instance_type: m5a.large
+    instance_type: m5.large
     assign_public_ip: true
     spot_price: 0.14
     aws_sec_group:
@@ -61,11 +61,11 @@ platforms:
       - jdk
       - chocolatey
 
-  - name: test-aws-windows2019-adoptopenjdk-chocolatey-12
+  - name: test-aws-windows2019-adoptopenjdk-chocolatey-13
     aws_image_id: ami-0477b9335a5a75438
     platform: windows2019core
     aws_region: us-east-1
-    instance_type: m5a.large
+    instance_type: m5.large
     assign_public_ip: true
     spot_price: 0.14
     aws_sec_group:
@@ -85,7 +85,7 @@ provisioner:
     group_vars:
       adoptopenjdk:
         java_distribution: adoptopenjdk
-        java_major_version: 12
+        java_major_version: 13
       jdk:
         java_package: jdk
       jre:

diff --git a/molecule/cloud-aws-direct-11/molecule.yml b/molecule/cloud-aws-direct-11/molecule.yml
@@ -13,7 +13,7 @@ platforms:
   - name: test-aws-centos7-oracle_java-11-s3
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -31,7 +31,7 @@ platforms:
   - name: test-aws-ubuntu18-oracle_java-11-s3-deb
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -49,7 +49,7 @@ platforms:
   - name: test-aws-Debian9-oracle_java-11-web-tb
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-direct-12/molecule.yml b/molecule/cloud-aws-direct-12/molecule.yml
@@ -13,7 +13,7 @@ platforms:
   - name: test-aws-centos7-oracle_java-12-s3-rpm
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -31,7 +31,7 @@ platforms:
   - name: test-aws-ubuntu18-oracle_java-12-s3-deb
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -49,7 +49,7 @@ platforms:
   - name: test-aws-Debian9-oracle_java-12-s3-tb
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af

diff --git a/molecule/cloud-aws-direct-6/molecule.yml b/molecule/cloud-aws-direct-6/molecule.yml
@@ -30,7 +30,7 @@ platforms:
   - name: test-aws-ubuntu18-oracle_java-6-tarball
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-direct-7/molecule.yml b/molecule/cloud-aws-direct-7/molecule.yml
@@ -30,7 +30,7 @@ platforms:
   - name: test-aws-Debian9-oracle_java-7-tarball
     image: ami-003f19e0e687de1cd
     platform: debian9
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-direct-8/molecule.yml b/molecule/cloud-aws-direct-8/molecule.yml
@@ -14,7 +14,7 @@ platforms:
   - name: test-aws-centos7-oracle_java-8-s3-rpm
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -32,7 +32,7 @@ platforms:
   - name: test-aws-centos7-oracle_java-8-s3
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -50,7 +50,7 @@ platforms:
   - name: test-aws-ubuntu18-oracle_java-8-s3
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     profile_name: epmldi-instance-profile
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
@@ -68,7 +68,7 @@ platforms:
   - name: test-aws-ubuntu18-oracle_java-8-local
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false

diff --git a/molecule/cloud-aws-openjdk-11/molecule.yml b/molecule/cloud-aws-openjdk-11/molecule.yml
@@ -13,7 +13,7 @@ platforms:
   - name: test-aws-centos7-openjdk-11-repo
     image: ami-9887c6e7
     platform: centos7
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false
@@ -46,7 +46,7 @@ platforms:
   - name: test-aws-ubuntu18-openjdk-11-repo
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
-    instance_type: m5a.large
+    instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     assign_public_ip: false