Skip to content

Commit 2d723d0

Browse files
committed
Fix Ansible warnings
And add support for Ubuntu 18.04 and Debian 9
1 parent 1e9a7d0 commit 2d723d0

File tree

4 files changed

+34
-9
lines changed

4 files changed

+34
-9
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ python: "2.7"
77

88
env:
99
- ANSIBLE_VERSION=latest
10+
- ANSIBLE_VERSION=2.7.2
1011
- ANSIBLE_VERSION=2.7.1
1112
- ANSIBLE_VERSION=2.7.0
13+
- ANSIBLE_VERSION=2.6.8
1214
- ANSIBLE_VERSION=2.6.7
1315
- ANSIBLE_VERSION=2.6.6
1416
- ANSIBLE_VERSION=2.6.5
@@ -59,7 +61,7 @@ script:
5961
&& (echo 'Idempotence test: pass' && exit 0)
6062
|| (echo 'Idempotence test: fail' && exit 1)
6163
62-
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
64+
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi
6365

6466
notifications:
6567
email: false

Vagrantfile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
role = File.basename(File.expand_path(File.dirname(__FILE__)))
55

6+
67
boxes = [
78
{
89
:name => "ubuntu-1204",
@@ -25,17 +26,31 @@ boxes = [
2526
:cpu => "50",
2627
:ram => "256"
2728
},
29+
{
30+
:name => "ubuntu-1804",
31+
:box => "bento/ubuntu-18.04",
32+
:ip => '10.0.0.14',
33+
:cpu => "50",
34+
:ram => "256"
35+
},
2836
{
2937
:name => "debian-7",
3038
:box => "bento/debian-7",
31-
:ip => '10.0.0.14',
39+
:ip => '10.0.0.15',
3240
:cpu => "50",
3341
:ram => "256"
3442
},
3543
{
3644
:name => "debian-8",
3745
:box => "bento/debian-8",
38-
:ip => '10.0.0.15',
46+
:ip => '10.0.0.16',
47+
:cpu => "50",
48+
:ram => "256"
49+
},
50+
{
51+
:name => "debian-9",
52+
:box => "bento/debian-9",
53+
:ip => '10.0.0.17',
3954
:cpu => "50",
4055
:ram => "256"
4156
},

meta/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# meta file for gnu-parallel
22
---
33
galaxy_info:
4+
role_name: gnu-parallel
45
author: Mischa ter Smitten
56
company: Oefenweb.nl B.V.
67
description: Set up the latest version of GNU Parallel in Debian-like systems
@@ -12,10 +13,12 @@ galaxy_info:
1213
- precise
1314
- trusty
1415
- xenial
16+
- bionic
1517
- name: Debian
1618
versions:
1719
- wheezy
1820
- jessie
21+
- stretch
1922
galaxy_tags:
2023
- shell
2124
- system

tasks/main.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
---
33
- name: install dependencies
44
apt:
5-
name: "{{ item }}"
5+
name: "{{ gnu_parallel_dependencies }}"
66
state: "{{ apt_install_state | default('latest') }}"
77
update_cache: true
88
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
9-
with_items: "{{ gnu_parallel_dependencies }}"
109
tags:
1110
- configuration
1211
- gnu-parallel
@@ -66,7 +65,10 @@
6665
- gnu-parallel-install-build
6766

6867
- name: version check
69-
shell: tar -jtf {{ gnu_parallel_download_path }}/{{ gnu_parallel_download_url | basename }} | head -n 1
68+
shell: >
69+
tar -jtf {{ gnu_parallel_download_path }}/{{ gnu_parallel_download_url | basename }} | head -n 1
70+
args:
71+
warn: false
7072
changed_when: false
7173
register: _version_check
7274
tags:
@@ -89,7 +91,8 @@
8991
- gnu-parallel-install-build
9092

9193
- name: configure
92-
command: ./configure
94+
command: >
95+
./configure
9396
args:
9497
chdir: "{{ gnu_parallel_build_path }}/{{ _version_check.stdout }}"
9598
when: _unarchive | changed
@@ -101,7 +104,8 @@
101104
- gnu-parallel-install-build-configure
102105

103106
- name: make
104-
command: make -j{{ ansible_processor_cores + 1 }}
107+
command: >
108+
make -j{{ ansible_processor_cores + 1 }}
105109
args:
106110
chdir: "{{ gnu_parallel_build_path }}/{{ _version_check.stdout }}"
107111
when: _unarchive | changed
@@ -113,7 +117,8 @@
113117
- gnu-parallel-install-build-make
114118

115119
- name: make install
116-
command: make install
120+
command: >
121+
make install
117122
args:
118123
chdir: "{{ gnu_parallel_build_path }}/{{ _version_check.stdout }}"
119124
when: _unarchive | changed

0 commit comments

Comments
 (0)