diff --git a/LICENSE b/LICENSE index 44acbef..59f23ab 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2014-2016 William Yeh + Copyright 2014-2016 Steve Daniels Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 3556250..c81f0a7 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ -williamyeh.oracle-java for Ansible Galaxy +jesussteve.oracle-java for Ansible Galaxy ============ - -[![Build Status](https://travis-ci.org/William-Yeh/ansible-oracle-java.svg?branch=master)](https://travis-ci.org/William-Yeh/ansible-oracle-java) [![Circle CI](https://circleci.com/gh/William-Yeh/ansible-oracle-java.svg?style=shield)](https://circleci.com/gh/William-Yeh/ansible-oracle-java) - ## Summary -Role name in Ansible Galaxy: **[williamyeh.oracle-java](https://galaxy.ansible.com/williamyeh/oracle-java/)** +Forked from William Yeh's [William-Yeh/ansible-oracle-java repo](https://github.com/William-Yeh/ansible-oracle-java). + +Role name in Ansible Galaxy: **[jesussteve.oracle-java](https://galaxy.ansible.com/jesussteve/oracle-java/)** This Ansible role has the following features for Oracle JDK: @@ -61,7 +60,7 @@ If you want to install a Java release which is not supported out-of-the-box, you - hosts: all roles: - - williamyeh.oracle-java + - jesussteve.oracle-java vars: java_version: 8 @@ -97,7 +96,7 @@ jdk_tarball_file ### Step 1: add role -Add role name `williamyeh.oracle-java` to your playbook file. +Add role name `jesussteve.oracle-java` to your playbook file. ### Step 2: add variables @@ -113,7 +112,7 @@ Simple example: - hosts: all roles: - - williamyeh.oracle-java + - jesussteve.oracle-java vars: java_version: 8 @@ -133,7 +132,7 @@ To do this, put the file on the `{{ playbook_dir }}/files` directory in advance, - hosts: all roles: - - williamyeh.oracle-java + - jesussteve.oracle-java vars: java_version: 8 diff --git a/Vagrantfile b/Vagrantfile index 4196073..672c798 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,7 +2,8 @@ Vagrant.configure(2) do |config| # main & default: normal OS series... config.vm.define "main", primary: true do |node| - node.vm.box = "ubuntu/trusty64" + node.vm.box = "ubuntu/xenial64" + #node.vm.box = "ubuntu/trusty64" #node.vm.box = "ubuntu/precise64" #node.vm.box = "debian/jessie64" #node.vm.box = "debian/wheezy64" @@ -20,10 +21,11 @@ Vagrant.configure(2) do |config| # docker: for auto build & testing (e.g., Travis CI) config.vm.define "docker" do |node| - node.vm.box = "williamyeh/ubuntu-trusty64-docker" + node.vm.box = "jesussteve/ubuntu-trusty64-docker" node.vm.provision "shell", inline: <<-SHELL cd /vagrant + docker build -f test/Dockerfile-ubuntu16.04 -t java_xenial . docker build -f test/Dockerfile-ubuntu14.04 -t java_trusty . docker build -f test/Dockerfile-ubuntu12.04 -t java_precise . docker build -f test/Dockerfile-debian8 -t java_jessie . diff --git a/circle.yml b/circle.yml index 93fc3a2..91c5cf2 100644 --- a/circle.yml +++ b/circle.yml @@ -15,6 +15,7 @@ dependencies: - sed -i -e 's/^\(java_download_from_oracle:\).*$/\1 false/' defaults/main.yml - echo "==> Building test cases..." + - docker build -f test/Dockerfile-ubuntu16.04 -t java_xenial . - docker build -f test/Dockerfile-ubuntu14.04 -t java_trusty . - docker build -f test/Dockerfile-ubuntu12.04 -t java_precise . - docker build -f test/Dockerfile-debian8 -t java_jessie . @@ -24,6 +25,7 @@ dependencies: test: override: + - docker run -i java_xenial 2> result-ubuntu14.04 - docker run -i java_trusty 2> result-ubuntu14.04 - docker run -i java_precise 2> result-ubuntu12.04 - docker run -i java_jessie 2> result-debian8 @@ -32,6 +34,7 @@ test: - docker run -i java_centos6 2> result-centos6 - echo "==> Validating the test results..." + - sh -c "[ -s result-ubuntu16.04 ]" - sh -c "[ -s result-ubuntu14.04 ]" - sh -c "[ -s result-ubuntu12.04 ]" - sh -c "[ -s result-debian8 ]" diff --git a/meta/main.yml b/meta/main.yml index d3e2cdf..bedaa58 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -2,7 +2,7 @@ # nginx/meta/main.yml galaxy_info: - author: williamyeh + author: jesussteve description: Oracle JDK 7/8 for CentOS/Debian/Ubuntu/Suse/MacOSX license: Apache @@ -13,6 +13,7 @@ galaxy_info: versions: - precise - trusty + - xenial - name: Debian versions: - wheezy diff --git a/test/Dockerfile-centos6 b/test/Dockerfile-centos6 index ef66358..eb0309a 100644 --- a/test/Dockerfile-centos6 +++ b/test/Dockerfile-centos6 @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:centos6-onbuild +FROM jesussteve/ansible:centos6-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-centos7 b/test/Dockerfile-centos7 index 2d67838..aeb4f48 100644 --- a/test/Dockerfile-centos7 +++ b/test/Dockerfile-centos7 @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:centos7-onbuild +FROM jesussteve/ansible:centos7-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-debian7 b/test/Dockerfile-debian7 index e66db94..f2214bf 100644 --- a/test/Dockerfile-debian7 +++ b/test/Dockerfile-debian7 @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:debian7-onbuild +FROM jesussteve/ansible:debian7-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-debian8 b/test/Dockerfile-debian8 index fb64139..5ea1465 100644 --- a/test/Dockerfile-debian8 +++ b/test/Dockerfile-debian8 @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:debian8-onbuild +FROM jesussteve/ansible:debian8-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-prefetch-rpm b/test/Dockerfile-prefetch-rpm index 590564f..2fd6cf3 100644 --- a/test/Dockerfile-prefetch-rpm +++ b/test/Dockerfile-prefetch-rpm @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:centos7-onbuild +FROM jesussteve/ansible:centos7-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-prefetch-tarball b/test/Dockerfile-prefetch-tarball index 121d482..3e7184b 100644 --- a/test/Dockerfile-prefetch-tarball +++ b/test/Dockerfile-prefetch-tarball @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:debian8-onbuild +FROM jesussteve/ansible:debian8-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-ubuntu12.04 b/test/Dockerfile-ubuntu12.04 index 6c460cf..844cb42 100644 --- a/test/Dockerfile-ubuntu12.04 +++ b/test/Dockerfile-ubuntu12.04 @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:ubuntu12.04-onbuild +FROM jesussteve/ansible:ubuntu12.04-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-ubuntu14.04 b/test/Dockerfile-ubuntu14.04 index 322fcc5..dd01289 100644 --- a/test/Dockerfile-ubuntu14.04 +++ b/test/Dockerfile-ubuntu14.04 @@ -5,9 +5,9 @@ # pull base image -FROM williamyeh/ansible:ubuntu14.04-onbuild +FROM jesussteve/ansible:ubuntu14.04-onbuild -MAINTAINER William Yeh +MAINTAINER Steve Daniels # diff --git a/test/Dockerfile-ubuntu16.04 b/test/Dockerfile-ubuntu16.04 new file mode 100644 index 0000000..3f0409d --- /dev/null +++ b/test/Dockerfile-ubuntu16.04 @@ -0,0 +1,29 @@ +# Dockerfile for building image that contains software stack provisioned by Ansible. +# +# Version 1.1 +# + + +# pull base image +FROM jesussteve/ansible:ubuntu16.04-onbuild + +MAINTAINER Steve Daniels + + +# +# build phase +# + +RUN echo "===> Patching defaults/main.yml to enable java_install_jce..." && \ + sed -i -e 's/^java_install_jce:.*/java_install_jce: true/g' defaults/main.yml + +ENV PLAYBOOK test.yml +RUN ansible-playbook-wrapper + + + +# +# test phase +# + +CMD ["java", "-version"] diff --git a/test/travis/before_install.sh b/test/travis/before_install.sh index 63512aa..ad79147 100755 --- a/test/travis/before_install.sh +++ b/test/travis/before_install.sh @@ -15,6 +15,7 @@ case "$TRAVIS_OS_NAME" in sed -i -e 's/^\(java_download_from_oracle:\).*$/\1 false/' defaults/main.yml echo "==> Building test cases..." + docker build -f test/Dockerfile-ubuntu16.04 -t java_trusty . docker build -f test/Dockerfile-ubuntu14.04 -t java_trusty . docker build -f test/Dockerfile-ubuntu12.04 -t java_precise . docker build -f test/Dockerfile-debian8 -t java_jessie . diff --git a/test/travis/script.sh b/test/travis/script.sh index 0930ffb..d7bb48c 100755 --- a/test/travis/script.sh +++ b/test/travis/script.sh @@ -4,6 +4,7 @@ set -uo pipefail case "$TRAVIS_OS_NAME" in linux) + docker run -i java_xenial 2> result-ubuntu16.04 docker run -i java_trusty 2> result-ubuntu14.04 docker run -i java_precise 2> result-ubuntu12.04 docker run -i java_jessie 2> result-debian8 @@ -12,6 +13,7 @@ case "$TRAVIS_OS_NAME" in docker run -i java_centos6 2> result-centos6 echo "==> Validating the test results..." + sh -c "[ -s result-ubuntu16.04 ]" sh -c "[ -s result-ubuntu14.04 ]" sh -c "[ -s result-ubuntu12.04 ]" sh -c "[ -s result-debian8 ]"