Update role dependencies
This commit is contained in:
1
roles/geerlingguy.java/.github/stale.yml
vendored
1
roles/geerlingguy.java/.github/stale.yml
vendored
@@ -12,6 +12,7 @@ onlyLabels: []
|
||||
|
||||
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
|
||||
exemptLabels:
|
||||
- bug
|
||||
- pinned
|
||||
- security
|
||||
- planned
|
||||
|
||||
2
roles/geerlingguy.java/.gitignore
vendored
2
roles/geerlingguy.java/.gitignore
vendored
@@ -1,3 +1,5 @@
|
||||
*.retry
|
||||
*/__pycache__
|
||||
*.pyc
|
||||
.cache
|
||||
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
---
|
||||
language: python
|
||||
services: docker
|
||||
|
||||
env:
|
||||
global:
|
||||
- ROLE_NAME: java
|
||||
matrix:
|
||||
- MOLECULE_DISTRO: centos8
|
||||
- MOLECULE_DISTRO: centos7
|
||||
- MOLECULE_DISTRO: centos6
|
||||
- MOLECULE_DISTRO: fedora31
|
||||
- MOLECULE_DISTRO: ubuntu2004
|
||||
- MOLECULE_DISTRO: ubuntu1804
|
||||
- MOLECULE_DISTRO: ubuntu1604
|
||||
- MOLECULE_DISTRO: debian10
|
||||
- MOLECULE_DISTRO: debian9
|
||||
|
||||
install:
|
||||
# Install test dependencies.
|
||||
- pip install molecule yamllint ansible-lint docker
|
||||
|
||||
before_script:
|
||||
# Use actual Ansible Galaxy role name for the project directory.
|
||||
- cd ../
|
||||
- mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
|
||||
- cd geerlingguy.$ROLE_NAME
|
||||
|
||||
script:
|
||||
# Run tests.
|
||||
- molecule test
|
||||
|
||||
notifications:
|
||||
webhooks: https://galaxy.ansible.com/api/v1/notifications/
|
||||
@@ -1,6 +1,11 @@
|
||||
---
|
||||
extends: default
|
||||
|
||||
rules:
|
||||
line-length:
|
||||
max: 120
|
||||
level: warning
|
||||
|
||||
ignore: |
|
||||
.github/stale.yml
|
||||
.travis.yml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Ansible Role: Java
|
||||
|
||||
[](https://travis-ci.org/geerlingguy/ansible-role-java)
|
||||
[](https://github.com/geerlingguy/ansible-role-java/actions?query=workflow%3ACI)
|
||||
|
||||
Installs Java for RedHat/CentOS and Debian/Ubuntu linux servers.
|
||||
Installs Java for RedHat/CentOS, Amazon and Debian/Ubuntu linux servers.
|
||||
|
||||
## Requirements
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
install_date: Fri Oct 15 18:59:11 2021
|
||||
version: 1.10.0
|
||||
install_date: Thu 08 Feb 2024 08:53:59 PM
|
||||
version: 2.3.3
|
||||
|
||||
@@ -7,13 +7,8 @@ galaxy_info:
|
||||
description: Java for Linux
|
||||
company: "Midwestern Mac, LLC"
|
||||
license: "license (BSD, MIT)"
|
||||
min_ansible_version: 2.4
|
||||
min_ansible_version: 2.10
|
||||
platforms:
|
||||
- name: EL
|
||||
versions:
|
||||
- 6
|
||||
- 7
|
||||
- 8
|
||||
- name: Fedora
|
||||
versions:
|
||||
- all
|
||||
@@ -23,6 +18,8 @@ galaxy_info:
|
||||
- jessie
|
||||
- stretch
|
||||
- buster
|
||||
- bullseye
|
||||
- bookworm
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
- precise
|
||||
@@ -30,6 +27,7 @@ galaxy_info:
|
||||
- xenial
|
||||
- bionic
|
||||
- focal
|
||||
- jammy
|
||||
- name: FreeBSD
|
||||
versions:
|
||||
- 10.2
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
|
||||
pre_tasks:
|
||||
- name: Update apt cache.
|
||||
apt: update_cache=true cache_valid_time=600
|
||||
apt:
|
||||
update_cache: true
|
||||
cache_valid_time: 600
|
||||
when: ansible_os_family == 'Debian'
|
||||
changed_when: false
|
||||
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
---
|
||||
role_name_check: 1
|
||||
dependency:
|
||||
name: galaxy
|
||||
options:
|
||||
ignore-errors: true
|
||||
driver:
|
||||
name: docker
|
||||
lint: |
|
||||
set -e
|
||||
yamllint .
|
||||
ansible-lint
|
||||
platforms:
|
||||
- name: instance
|
||||
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
|
||||
image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux8}-ansible:latest"
|
||||
command: ${MOLECULE_DOCKER_COMMAND:-""}
|
||||
volumes:
|
||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||
- /sys/fs/cgroup:/sys/fs/cgroup:rw
|
||||
cgroupns_mode: host
|
||||
privileged: true
|
||||
pre_build_image: true
|
||||
provisioner:
|
||||
|
||||
@@ -3,18 +3,28 @@
|
||||
include_vars: "{{ ansible_distribution }}.yml"
|
||||
when: ansible_distribution == 'FreeBSD' or ansible_distribution == 'Fedora'
|
||||
|
||||
- name: Include OS-specific variables for Amazon.
|
||||
include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml"
|
||||
when: ansible_distribution == 'Amazon'
|
||||
|
||||
- name: Include version-specific variables for CentOS/RHEL.
|
||||
include_vars: "RedHat-{{ ansible_distribution_version.split('.')[0] }}.yml"
|
||||
when: ansible_distribution == 'CentOS' or
|
||||
ansible_distribution == 'Red Hat Enterprise Linux' or
|
||||
ansible_distribution == 'RedHat'
|
||||
when: >-
|
||||
ansible_distribution in [
|
||||
'CentOS',
|
||||
'Red Hat Enterprise Linux',
|
||||
'RedHat',
|
||||
'OracleLinux',
|
||||
'Rocky',
|
||||
'AlmaLinux'
|
||||
]
|
||||
|
||||
- name: Include version-specific variables for Ubuntu.
|
||||
include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
|
||||
when: ansible_distribution == 'Ubuntu'
|
||||
|
||||
- name: Include version-specific variables for Debian.
|
||||
include_vars: "{{ ansible_distribution|title }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
|
||||
include_vars: "{{ ansible_distribution | title }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
|
||||
when: ansible_os_family == 'Debian'
|
||||
|
||||
- name: Define java_packages.
|
||||
@@ -24,7 +34,10 @@
|
||||
|
||||
# Setup/install tasks.
|
||||
- include_tasks: setup-RedHat.yml
|
||||
when: ansible_os_family == 'RedHat'
|
||||
when: ansible_os_family == 'RedHat' and ansible_distribution_file_variety == 'RedHat'
|
||||
|
||||
- include_tasks: setup-Amazon.yml
|
||||
when: ansible_distribution == 'Amazon'
|
||||
|
||||
- include_tasks: setup-Debian.yml
|
||||
when: ansible_os_family == 'Debian'
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 and
|
||||
# https://github.com/geerlingguy/ansible-role-java/issues/64
|
||||
- name: Ensure 'man' directory exists.
|
||||
file:
|
||||
file: # noqa 208
|
||||
path: /usr/share/man/man1
|
||||
state: directory
|
||||
recurse: true
|
||||
mode: 0755
|
||||
when:
|
||||
- ansible_distribution == 'Ubuntu'
|
||||
- ansible_distribution_major_version | int >= 18
|
||||
|
||||
@@ -4,8 +4,18 @@
|
||||
name: "{{ java_packages }}"
|
||||
state: present
|
||||
|
||||
- name: ensure proc is mounted
|
||||
mount: name=/proc fstype=procfs src=proc opts=rw state=mounted
|
||||
- name: Ensure proc is mounted
|
||||
mount:
|
||||
name: /proc
|
||||
fstype: procfs
|
||||
src: proc
|
||||
opts: rw
|
||||
state: mounted
|
||||
|
||||
- name: ensure fdesc is mounted
|
||||
mount: name=/dev/fd fstype=fdescfs src=fdesc opts=rw state=mounted
|
||||
- name: Ensure fdesc is mounted
|
||||
mount:
|
||||
name: /dev/fd
|
||||
fstype: fdescfs
|
||||
src: fdesc
|
||||
opts: rw
|
||||
state: mounted
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
---
|
||||
# JDK version options include:
|
||||
# - java
|
||||
# - java-1.6.0-openjdk
|
||||
# - java-1.7.0-openjdk
|
||||
__java_packages:
|
||||
- java-1.7.0-openjdk
|
||||
@@ -3,6 +3,7 @@
|
||||
# - java
|
||||
# - java-1.6.0-openjdk
|
||||
# - java-1.7.0-openjdk
|
||||
# - java-1.8.0-openjdk
|
||||
# - java-1.8.0-openjdk-devel
|
||||
# - java-11-openjdk-devel
|
||||
__java_packages:
|
||||
- java-1.8.0-openjdk
|
||||
|
||||
Reference in New Issue
Block a user