Skip to content

Commit

Permalink
Drop EL6 support
Browse files Browse the repository at this point in the history
Current acceptance tests are failing and it's going EOL soon.
  • Loading branch information
ekohl committed Nov 26, 2020
1 parent f558f49 commit d1f98a0
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,6 @@ that were available on 2017-11-29:
* Ubuntu 16.04 (Xenial) ```0.10``` ```0.12``` ```4.x``` ```5.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
* Ubuntu 16.10 (Yakkety) ```0.12``` ```4.x``` ```6.x``` ```7.x``` ```8.x```
* Ubuntu 17.10 (Artful) ```4.x``` ```6.x``` ```8.x``` ```9.x```
* RHEL/CentOS 6 ```0.10``` ```0.12``` ```4.x``` ```5.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
* RHEL/CentOS 7 ```0.10``` ```0.12``` ```4.x``` ```5.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
* Amazon Linux - See RHEL/CentOS 7
* Fedora 25 ```4.x``` ```6.x``` ```7.x``` ```8.x``` ```9.x```
Expand All @@ -520,16 +519,15 @@ this with the package_provider parameter to use an alternative

This module has received limited testing on:

* CentOS/RHEL 6/7/8
* Debian 8
* CentOS/RHEL 7/8
* Debian 9/10
* Ubuntu 16.04/18.04/20.04

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
$package_provider = undef
}
'RedHat': {
if $facts['os']['release']['major'] =~ /^[678]$/ {
if $facts['os']['release']['major'] =~ /^[78]$/ {
$manage_package_repo = true
$nodejs_debug_package_name = 'nodejs-debuginfo'
$nodejs_dev_package_name = 'nodejs-devel'
Expand Down
2 changes: 1 addition & 1 deletion manifests/repo/nodesource.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

case $facts['os']['family'] {
'RedHat': {
if $facts['os']['release']['major'] =~ /^[678]$/ {
if $facts['os']['release']['major'] =~ /^[78]$/ {
$dist_version = $facts['os']['release']['major']
$name_string = "Enterprise Linux ${dist_version}"
}
Expand Down
4 changes: 0 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,27 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7",
"8"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7",
"8"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"6",
"7",
"8"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"6",
"7",
"8"
]
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/nodejs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,11 @@
end
end

['6.0', '7.0', '27'].each do |operatingsystemrelease|
['7.0', '27'].each do |operatingsystemrelease|
osversions = operatingsystemrelease.split('.')
operatingsystemmajrelease = osversions[0]

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

0 comments on commit d1f98a0

Please sign in to comment.