Skip to content

Commit be3e718

Browse files
committed
Drop EL6 support
Current acceptance tests are failing and it's going EOL soon.
1 parent f558f49 commit be3e718

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@ that were available on 2017-11-29:
499499
* Ubuntu 16.04 (Xenial) ```0.10``` ```0.12``` ```4.x``` ```5.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
500500
* Ubuntu 16.10 (Yakkety) ```0.12``` ```4.x``` ```6.x``` ```7.x``` ```8.x```
501501
* Ubuntu 17.10 (Artful) ```4.x``` ```6.x``` ```8.x``` ```9.x```
502-
* RHEL/CentOS 6 ```0.10``` ```0.12``` ```4.x``` ```5.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
503502
* RHEL/CentOS 7 ```0.10``` ```0.12``` ```4.x``` ```5.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
504503
* Amazon Linux - See RHEL/CentOS 7
505504
* Fedora 25 ```4.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
@@ -520,16 +519,15 @@ this with the package_provider parameter to use an alternative
520519

521520
This module has received limited testing on:
522521

523-
* CentOS/RHEL 6/7/8
524-
* Debian 8
522+
* CentOS/RHEL 7/8
523+
* Debian 9/10
525524
* Ubuntu 16.04/18.04/20.04
526525

527526
The following platforms should also work, but have not been tested:
528527

529528
* Amazon Linux
530529
* Archlinux
531530
* Darwin
532-
* Debian 9
533531
* Fedora
534532
* FreeBSD
535533
* Gentoo
@@ -544,7 +542,7 @@ This modules uses `puppetlabs-apt` for the management of the NodeSource
544542
repository. If using an operating system of the Debian-based family, you will
545543
need to ensure that `puppetlabs-apt` version 4.4.0 or above is installed.
546544

547-
If using CentOS/RHEL 6/7 and you wish to install Node.js from EPEL rather
545+
If using CentOS/RHEL 7 and you wish to install Node.js from EPEL rather
548546
than from the NodeSource repository, you will need to ensure `puppet-epel` is
549547
installed and is applied before this module.
550548

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
$package_provider = undef
7979
}
8080
'RedHat': {
81-
if $facts['os']['release']['major'] =~ /^[678]$/ {
81+
if $facts['os']['release']['major'] =~ /^[78]$/ {
8282
$manage_package_repo = true
8383
$nodejs_debug_package_name = 'nodejs-debuginfo'
8484
$nodejs_dev_package_name = 'nodejs-devel'

manifests/repo/nodesource.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
case $facts['os']['family'] {
1414
'RedHat': {
15-
if $facts['os']['release']['major'] =~ /^[678]$/ {
15+
if $facts['os']['release']['major'] =~ /^[78]$/ {
1616
$dist_version = $facts['os']['release']['major']
1717
$name_string = "Enterprise Linux ${dist_version}"
1818
}

metadata.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,27 @@
1111
{
1212
"operatingsystem": "RedHat",
1313
"operatingsystemrelease": [
14-
"6",
1514
"7",
1615
"8"
1716
]
1817
},
1918
{
2019
"operatingsystem": "CentOS",
2120
"operatingsystemrelease": [
22-
"6",
2321
"7",
2422
"8"
2523
]
2624
},
2725
{
2826
"operatingsystem": "OracleLinux",
2927
"operatingsystemrelease": [
30-
"6",
3128
"7",
3229
"8"
3330
]
3431
},
3532
{
3633
"operatingsystem": "Scientific",
3734
"operatingsystemrelease": [
38-
"6",
3935
"7",
4036
"8"
4137
]

spec/classes/nodejs_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@
312312
end
313313
end
314314

315-
['6.0', '7.0', '27'].each do |operatingsystemrelease|
315+
['7.0', '27'].each do |operatingsystemrelease|
316316
osversions = operatingsystemrelease.split('.')
317317
operatingsystemmajrelease = osversions[0]
318318

319-
if operatingsystemrelease =~ %r{^[6-7]\.(\d+)}
319+
if operatingsystemmajrelease == '7'
320320
operatingsystem = 'CentOS'
321321
dist_type = 'el'
322322
repo_baseurl = "https://rpm.nodesource.com/pub_12.x/#{dist_type}/#{operatingsystemmajrelease}/\$basearch"

0 commit comments

Comments
 (0)