Semtantic change

Author: vicsufer

.travis.yml

@@ -22,7 +22,7 @@ env:
   - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=11 JDK_VERSION=11.0.6+10-1~bpo9+1 DOCKER_TAG_TO_PUBLISH=11.0.6-stretch-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim DOCKER_TAG_TO_PUBLISH=11-buster-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VERSION=11.0.8+10-1~deb10u1 DOCKER_TAG_TO_PUBLISH=11.0.8-buster-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_BUILD=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u265-b01-3 DOCKER_TAG_TO_PUBLISH=8u265-buster-adoptopenjdk-headless
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u265-b01-3 DOCKER_TAG_TO_PUBLISH=8u265-buster-adoptopenjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial DOCKER_TAG_TO_PUBLISH=9-xenial-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial JDK_MAJOR=8 JDK_VERSION=8u265-b01-0ubuntu2~16.04 DOCKER_TAG_TO_PUBLISH=8u265-xenial-openjdk-headless
   - DOCKER_IMAGE_BASE=amd64/ubuntu:xenial JDK_MAJOR=9 JDK_VERSION=9~b114-0ubuntu1 DOCKER_TAG_TO_PUBLISH=9b114-xenial-openjdk-headless

defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-jdk_build: openjdk
+java_jdk_vendor: openjdk

molecule/adoptopenjdk/group_vars/openjdk/main.yml

@@ -1,5 +1,5 @@
 ---
-jdk_build: adoptopenjdk
+java_jdk_vendor: adoptopenjdk
 java_open_jdk_apt_extra_packages:
   - python-apt
   - apt-transport-https

molecule/corretto/group_vars/openjdk/main.yml

@@ -1,5 +1,5 @@
 ---
-jdk_build: corretto
+java_jdk_vendor: corretto
 
 java_open_jdk_version_major: 11
 # Supported versions: 8 (1.8.0 in RHEL), 11

molecule/default/verify.yml

@@ -32,7 +32,7 @@
     # Allowing to 'override' variables that are defined using include_vars
 
     - name: Java | Gather JDK build variables
-      include_vars: "../../vars/jdk-builds/{{ jdk_build }}.yml"
+      include_vars: "../../vars/jdk-builds/{{ java_jdk_vendor }}.yml"
 
     - name: Java | Setting OS specific variables
       set_fact:

packer/template.json

@@ -6,7 +6,7 @@
       "docker_username": "{{env `DOCKER_USERNAME`}}",
       "docker_password": "{{env `DOCKER_PASSWORD`}}",
       "docker_tag_to_publish": "{{env `DOCKER_TAG_TO_PUBLISH`}}",
-      "jdk_build": "{{env `JDK_BUILD`}}",
+      "java_jdk_vendor": "{{env `JDK_VENDOR`}}",
       "jdk_version": "{{env `JDK_VERSION`}}",
       "jdk_major":  "{{env `JDK_MAJOR`}}"
     },
@@ -42,7 +42,7 @@
         "playbook_file": "{{ template_dir }}/playbook.yml",
         "extra_arguments": [
           "--extra-vars",
-          "ansible_host={{user `ansible_host`}} ansible_connection={{user `ansible_connection`}} jdk_build={{user `jdk_build`}} java_open_jdk_version={{user `jdk_version`}} java_open_jdk_version_major={{user `jdk_major`}}"
+          "ansible_host={{user `ansible_host`}} ansible_connection={{user `ansible_connection`}} java_jdk_vendor={{user `java_jdk_vendor`}} java_open_jdk_version={{user `jdk_version`}} java_open_jdk_version_major={{user `jdk_major`}}"
         ]
       }
     ],

tasks/install_openjdk.yml

@@ -8,7 +8,7 @@
 - name: Java | Gather JDK build specific variables
   include_vars: "{{ item }}"
   with_first_found:
-    - "jdk-builds/{{ jdk_build }}.yml"
+    - "jdk-builds/{{ java_jdk_vendor }}.yml"
 
 # Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
 # Allowing to 'override' variables that are defined using include_vars