Skip to content

Commit f2c99e5

Browse files
committed
Merge branch 'release/0.3.0'
* release/0.3.0: (56 commits) Apply Infopen Ansible role template 0.36.0 Update tox from 3.0.0 to 3.16.1 Update testinfra from 1.14.0 to 5.2.1 Update pytest from 3.6.2 to 5.4.3 Update pytest from 3.6.1 to 3.6.2 Update molecule from 2.14.0 to 2.15.0 Update testinfra from 1.13.1 to 1.14.0 Update pytest from 3.6.0 to 3.6.1 Update testinfra from 1.13.0 to 1.13.1 Update pytest from 3.5.1 to 3.6.0 Update molecule from 2.13.1 to 2.14.0 Update testinfra from 1.12.0 to 1.13.0 Update molecule from 2.13.0 to 2.13.1 Update molecule from 2.12.1 to 2.13.0 Update pytest from 3.5.0 to 3.5.1 Update testinfra from 1.11.1 to 1.12.0 Update pytest from 3.4.2 to 3.5.0 Update tox from 2.9.1 to 3.0.0 Update molecule from 2.11.0 to 2.12.1 Update molecule from 2.10.0 to 2.11.0 ...
2 parents 16a588e + 7cdd382 commit f2c99e5

30 files changed

+316
-189
lines changed

.github/workflows/ci.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
3+
name: CI
4+
5+
on:
6+
pull_request: null
7+
push: null
8+
9+
jobs:
10+
tests:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
python-version: [3.6, 3.7, 3.8]
15+
ansible-version: [2.8, 2.9]
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v2
19+
- name: Set up Python ${{ matrix.python-version }}
20+
uses: actions/setup-python@v2
21+
with:
22+
python-version: ${{ matrix.python-version }}
23+
- name: Install dependencies
24+
run: |
25+
python -m pip install --upgrade pip
26+
pip install -r requirements.txt
27+
- name: Run tests
28+
env:
29+
MOLECULE_OPTIONS: ''
30+
TOXENV: py${{ matrix.python-version }}-ansible${{ matrix.ansible-version }}
31+
run: |
32+
tox
33+
release:
34+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
35+
needs:
36+
- tests
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Upload to galaxy
40+
uses: robertdebock/galaxy-action@1.0.3
41+
with:
42+
galaxy_api_key: ${{ secrets.galaxy_api_key }}
43+
- name: Create Release
44+
uses: actions/create-release@v1
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
with:
48+
tag_name: ${{ github.ref }}
49+
release_name: ${{ github.ref }}
50+
body: ''
51+
draft: false
52+
prerelease: false

.mergify.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
pull_request_rules:
4+
- name: 'Automatic merge PyUP updates on CI success'
5+
conditions:
6+
- 'author=pyup-bot'
7+
- 'base=develop'
8+
- 'status-success=tests'
9+
actions:
10+
merge:
11+
method: 'merge'

.pyup.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
# Pyup configuration
44

55
branch: 'develop'
6+
7+
requirements:
8+
- 'requirements.txt'
9+
- 'tox.ini'

.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.yamllint

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
3+
extends: default
4+
5+
ignore: |
6+
.tox/
7+
8+
rules:
9+
braces:
10+
max-spaces-inside: 1
11+
level: error
12+
brackets:
13+
max-spaces-inside: 1
14+
level: error
15+
line-length: disable
16+
truthy: disable

README.md

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
# openjdk-jdk
22

3-
[![Build Status](https://travis-ci.org/infOpen/ansible-role-openjdk-jdk.svg?branch=master)](https://travis-ci.org/infOpen/ansible-role-openjdk-jdk)
3+
[![CI](https://github.com/infOpen/ansible-role-openjdk-jdk/workflows/CI/badge.svg)](https://github.com/infOpen/ansible-role-openjdk-jdk/actions)
4+
[![Mergify Status][mergify-status]][mergify]
5+
[![Updates](https://pyup.io/repos/github/infOpen/ansible-role-openjdk-jdk/shield.svg)](https://pyup.io/repos/github/infOpen/ansible-role-openjdk-jdk/)
6+
[![Python 3](https://pyup.io/repos/github/infOpen/ansible-role-openjdk-jdk/python-3-shield.svg)](https://pyup.io/repos/github/infOpen/ansible-role-openjdk-jdk/)
7+
[![Ansible Role](https://img.shields.io/ansible/role/15858.svg)](https://galaxy.ansible.com/infOpen/openjdk-jdk/)
48

59
Install openjdk-jdk package.
610

711
## Requirements
812

9-
This role requires Ansible 2.0 or higher,
13+
This role requires Ansible 2.8 or higher,
1014
and platform requirements are listed in the metadata file.
1115

1216
## Testing
1317

14-
This role use [Molecule](https://github.com/metacloud/molecule/) to run tests.
18+
This role use [Molecule](https://github.com/ansible-community/molecule) to run tests.
1519

16-
Locally, you can run tests on Docker (default driver) or Vagrant.
17-
Travis run tests using Docker driver only.
20+
Local and Github Actions tests run tests on Docker by default.
21+
See molecule documentation to use other backend.
1822

1923
Currently, tests are done on:
20-
- Debian Jessie
21-
- Ubuntu Trusty
22-
- Ubuntu Xenial
24+
- CentOS 7
25+
- CentOS 8
26+
- Debian Buster
27+
- Debian Stretch
28+
- Ubuntu Bionic
29+
- Ubuntu Focal
2330

2431
and use:
25-
- Ansible 2.0.x
26-
- Ansible 2.1.x
27-
- Ansible 2.2.x
28-
- Ansible 2.3.x
32+
- Ansible 2.8.x
33+
- Ansible 2.9.x
2934

3035
### Running tests
3136

@@ -35,10 +40,12 @@ and use:
3540
$ tox
3641
```
3742

38-
#### Using Vagrant driver
43+
You can also configure molecule options and molecule command using environment variables:
44+
* `MOLECULE_OPTIONS` Default: "--debug"
45+
* `MOLECULE_COMMAND` Default: "test"
3946

4047
```
41-
$ MOLECULE_DRIVER=vagrant tox
48+
$ MOLECULE_OPTIONS='' MOLECULE_COMMAND=converge tox
4249
```
4350

4451
## Role Variables
@@ -99,5 +106,8 @@ MIT
99106
## Author Information
100107
101108
Alexandre Chaussier (for Infopen company)
102-
- http://www.infopen.pro
109+
- https://www.infopen.pro
103110
- a.chaussier [at] infopen.pro
111+
112+
[mergify]: https://mergify.io
113+
[mergify-status]: https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/infOpen/ansible-role-openjdk-jdk&style=flat

meta/main.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22

33
galaxy_info:
44
author: 'Alexandre Chaussier'
5-
description: 'Install openjdk-jdk package'
6-
company: 'Infopen (http://www.infopen.pro)'
5+
description: 'Ansible role to install and configure openjdk-jdk'
6+
company: 'Infopen (https://www.infopen.pro)'
77
license: 'MIT'
8-
min_ansible_version: '2.0'
8+
min_ansible_version: '2.8'
99
github_branch: 'master'
1010
platforms:
1111
- name: 'Debian'
1212
versions:
13-
- 'jessie'
13+
- 'stretch'
14+
- 'buster'
1415
- name: 'Ubuntu'
1516
versions:
16-
- 'trusty'
17-
- 'xenial'
17+
- 'focal'
18+
- 'bionic'
19+
- name: 'EL'
20+
versions:
21+
- '7'
22+
- '8'
1823
galaxy_tags:
1924
- 'development'
2025
- 'system'

molecule.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

molecule/default/Dockerfile.j2

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Molecule managed
2+
3+
{% if item.registry is defined %}
4+
FROM {{ item.registry.url }}/{{ item.image }}
5+
{% else %}
6+
FROM {{ item.image }}
7+
{% endif %}
8+
9+
{% if item.env is defined %}
10+
{% for var, value in item.env.items() %}
11+
{% if value %}
12+
ENV {{ var }} {{ value }}
13+
{% endif %}
14+
{% endfor %}
15+
{% endif %}
16+
17+
RUN if [ $(command -v apt-get) ]; then DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt aptitude && apt-get clean; \
18+
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && dnf clean all; \
19+
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y /usr/bin/python /usr/bin/python2-config sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
20+
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python3 sudo bash iproute2 && zypper clean -a; \
21+
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python3 sudo bash ca-certificates; \
22+
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python3 sudo bash ca-certificates iproute2 && xbps-remove -O; fi

molecule/default/INSTALL.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
*******
2+
Install
3+
*******
4+
5+
Requirements
6+
============
7+
8+
* Docker Engine
9+
* docker-py
10+
11+
Install
12+
=======
13+
14+
.. code-block:: bash
15+
16+
$ sudo pip install docker-py

0 commit comments

Comments
 (0)