Skip to content

Commit 97d5b6f

Browse files
author
Gavin Williams
committed
Update metadata.json supported OS'
1 parent 2ae8b82 commit 97d5b6f

File tree

2 files changed

+21
-62
lines changed

2 files changed

+21
-62
lines changed

.travis.yml

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,11 @@ language: ruby
1111
script: travis_retry bundle exec rake $TASK
1212
jobs:
1313
allow_failures:
14-
- env:
15-
- TASK=beaker:ubuntu-server-1404-x64:snapshot
16-
- env:
17-
- OSS_PACKAGE=true
18-
- TASK=beaker:ubuntu-server-1404-x64:snapshot
1914
- env:
2015
- TASK=beaker:ubuntu-server-1604-x64:snapshot
2116
- env:
2217
- OSS_PACKAGE=true
2318
- TASK=beaker:ubuntu-server-1604-x64:snapshot
24-
- env:
25-
- TASK=beaker:centos-6-x64:snapshot
26-
- env:
27-
- OSS_PACKAGE=true
28-
- TASK=beaker:centos-6-x64:snapshot
2919
- env:
3020
- TASK=beaker:centos-7-x64:snapshot
3121
- env:
@@ -61,12 +51,6 @@ jobs:
6151
- env:
6252
- BEAKER_PUPPET_COLLECTION=puppet6
6353
- TASK=beaker:amazonlinux-2-x64:acceptance[6.8.12]
64-
- env:
65-
- BEAKER_PUPPET_COLLECTION=puppet6
66-
- TASK=beaker:centos-6-x64:acceptance
67-
- env:
68-
- BEAKER_PUPPET_COLLECTION=puppet6
69-
- TASK=beaker:centos-6-x64:acceptance[6.8.12]
7054
- env:
7155
- BEAKER_PUPPET_COLLECTION=puppet6
7256
- TASK=beaker:centos-7-x64:acceptance
@@ -79,12 +63,6 @@ jobs:
7963
- env:
8064
- BEAKER_PUPPET_COLLECTION=puppet6
8165
- TASK=beaker:centos-8-x64:acceptance[6.8.12]
82-
- env:
83-
- BEAKER_PUPPET_COLLECTION=puppet6
84-
- TASK=beaker:oracle-6-x64:acceptance
85-
- env:
86-
- BEAKER_PUPPET_COLLECTION=puppet6
87-
- TASK=beaker:oracle-6-x64:acceptance[6.8.12]
8866
- env:
8967
- BEAKER_PUPPET_COLLECTION=puppet6
9068
- TASK=beaker:oracle-7-x64:acceptance
@@ -109,12 +87,6 @@ jobs:
10987
- env:
11088
- BEAKER_PUPPET_COLLECTION=puppet6
11189
- TASK=beaker:debian-10-x64:acceptance[6.8.12]
112-
- env:
113-
- BEAKER_PUPPET_COLLECTION=puppet6
114-
- TASK=beaker:ubuntu-server-1404-x64:acceptance
115-
- env:
116-
- BEAKER_PUPPET_COLLECTION=puppet6
117-
- TASK=beaker:ubuntu-server-1404-x64:acceptance[6.8.12]
11890
- env:
11991
- BEAKER_PUPPET_COLLECTION=puppet6
12092
- TASK=beaker:ubuntu-server-1604-x64:acceptance
@@ -127,28 +99,18 @@ jobs:
12799
- env:
128100
- BEAKER_PUPPET_COLLECTION=puppet6
129101
- TASK=beaker:ubuntu-server-1804-x64:acceptance[6.8.12]
130-
# - env:
131-
# - BEAKER_PUPPET_COLLECTION=puppet6
132-
# - TASK=beaker:ubuntu-server-2004-x64:acceptance
133-
# - env:
134-
# - BEAKER_PUPPET_COLLECTION=puppet6
135-
# - TASK=beaker:ubuntu-server-2004-x64:acceptance[6.8.12]
102+
- env:
103+
- BEAKER_PUPPET_COLLECTION=puppet6
104+
- TASK=beaker:ubuntu-server-2004-x64:acceptance
105+
- env:
106+
- BEAKER_PUPPET_COLLECTION=puppet6
107+
- TASK=beaker:ubuntu-server-2004-x64:acceptance[6.8.12]
136108
- stage: snapshots
137-
env:
138-
- TASK=beaker:ubuntu-server-1404-x64:snapshot
139-
env:
140-
- OSS_PACKAGE=true
141-
- TASK=beaker:ubuntu-server-1404-x64:snapshot
142109
- env:
143110
- TASK=beaker:ubuntu-server-1604-x64:snapshot
144111
- env:
145112
- OSS_PACKAGE=true
146113
- TASK=beaker:ubuntu-server-1604-x64:snapshot
147-
- env:
148-
- TASK=beaker:centos-6-x64:snapshot
149-
- env:
150-
- OSS_PACKAGE=true
151-
- TASK=beaker:centos-6-x64:snapshot
152114
- env:
153115
- TASK=beaker:centos-7-x64:snapshot
154116
- env:

metadata.json

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
"author": "elastic",
66
"license": "Apache-2.0",
77
"summary": "Module for managing and configuring Elasticsearch nodes",
8-
"description": "Module for managing and configuring Elasticsearch nodes",
98
"project_page": "https://github.com/elastic/puppet-elasticsearch",
109
"issues_url": "https://github.com/elastic/puppet-elasticsearch/issues",
1110
"dependencies": [
1211
{
1312
"name": "elastic/elastic_stack",
14-
"version_requirement": ">= 6.1.0 < 7.0.0"
13+
"version_requirement": ">= 6.1.0 < 8.0.0"
1514
},
1615
{
1716
"name": "richardc/datacat",
@@ -26,47 +25,45 @@
2625
{
2726
"operatingsystem": "RedHat",
2827
"operatingsystemrelease": [
29-
"5",
30-
"6",
31-
"7"
28+
"7",
29+
"8"
3230
]
3331
},
3432
{
3533
"operatingsystem": "CentOS",
3634
"operatingsystemrelease": [
37-
"5",
38-
"6",
39-
"7"
35+
"7",
36+
"8"
4037
]
4138
},
4239
{
4340
"operatingsystem": "OracleLinux",
4441
"operatingsystemrelease": [
45-
"5",
46-
"6",
47-
"7"
42+
"7",
43+
"8"
4844
]
4945
},
5046
{
5147
"operatingsystem": "Scientific",
5248
"operatingsystemrelease": [
53-
"5",
54-
"6",
55-
"7"
49+
"7",
50+
"8"
5651
]
5752
},
5853
{
5954
"operatingsystem": "Debian",
6055
"operatingsystemrelease": [
61-
"7",
62-
"8"
56+
"8",
57+
"9",
58+
"10"
6359
]
6460
},
6561
{
6662
"operatingsystem": "Ubuntu",
6763
"operatingsystemrelease": [
68-
"14.04",
69-
"16.04"
64+
"16.04",
65+
"18.04",
66+
"20.04"
7067
]
7168
},
7269
{

0 commit comments

Comments
 (0)