Skip to content

retry RPM download if it fails #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

retry RPM download if it fails #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
451ebc8
added linux mint support
mhristof Dec 11, 2017
513ec77
add-linux-mint-support
mhristof Dec 11, 2017
be21a97
update expected version.
steenzout Dec 11, 2017
8d60633
retry RPM download if it fails
ardentperf Feb 24, 2018
3241dda
Merge branch 'develop' into patch-1
steenzout Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions defaults/linuxmint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian.yml
5 changes: 5 additions & 0 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ oracle_java_version_string: "1.{{ oracle_java_version }}.0_{{ oracle_java_versio
oracle_java_ansible_arch_mappings:
x86_64: x64
i386: i586

# codename hash to convert mint to ubuntu releases
oracle_java_ppa_mint:
sonya: xenial
sylvia: xenial
4 changes: 4 additions & 0 deletions meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ galaxy_info:
- vivid
- trusty
- precise
- name: Linuxmint
versions:
- sonya
- sylvia
galaxy_tags:
- development
- java
Expand Down
5 changes: 3 additions & 2 deletions tasks/debian/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
# Task file to install Oracle Java Development Kit in a system with a Debian based Linux distribution.
#

- name: debian | ubuntu | add java ppa repo
- name: debian | (ubuntu or mint) | add java ppa repo
apt_repository:
repo=ppa:webupd8team/java
state=present
codename='{{ oracle_java_ppa_mint[ansible_lsb.codename]|default(ansible_lsb.codename) }}'
become: yes
when: ansible_distribution == 'Ubuntu'
when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Linuxmint'

- block:
- name: debian | ensure the webupd8 launchpad apt repository key is present
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

- name: if debian, include family specific task file
include: "debian/main.yml"
when: ansible_os_family | lower == 'debian'
when: ansible_os_family | lower == 'debian' or ansible_os_family | lower == 'linuxmint'

- name: if redhat, include family specific task file
include: "redhat/main.yml"
Expand Down
1 change: 1 addition & 0 deletions tasks/redhat/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
validate_certs="{{ oracle_java_rpm_validate_certs }}"
timeout={{ oracle_java_download_timeout }}
register: oracle_java_task_rpm_download
until: oracle_java_task_rpm_download|succeeded
become: yes
tags: [ installation ]

Expand Down
2 changes: 1 addition & 1 deletion tests/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
test_java_version: 8
test_java_version_update: 112
test_java_version_build: 15
test_latest_java_version_update: 144
test_latest_java_version_update: 151
test_latest_java_version_build: 13

roles:
Expand Down