diff --git a/.sync.yml b/.sync.yml index c20980dc..4874b0e7 100644 --- a/.sync.yml +++ b/.sync.yml @@ -6,5 +6,7 @@ - set: ubuntu1804-64 - set: centos7-64 - set: debian8-64 + - set: debian9-64 + - set: debian10-64 spec/spec_helper.rb: mock_with: ':mocha' diff --git a/.travis.yml b/.travis.yml index 5b373d92..b2186ea1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,22 @@ matrix: bundler_args: --without development release env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian10-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker branches: only: - master diff --git a/README.md b/README.md index 8afc420a..cb004212 100644 --- a/README.md +++ b/README.md @@ -51,14 +51,14 @@ To install Node.js and npm (using the NodeSource repository if possible): class { 'nodejs': } ``` -The default version installed is currently `8.x`. +The default version installed is currently `12.x`. -If you wish to install a Node.js 9.x release from the NodeSource repository -rather than 8.x on Debian/RHEL platforms: +If you wish to install a Node.js 13.x release from the NodeSource repository +rather than 12.x on Debian/RHEL platforms: ```puppet class { 'nodejs': - repo_url_suffix => '9.x', + repo_url_suffix => '13.x', } ``` @@ -481,8 +481,8 @@ then work as expected on these systems. #### `repo_url_suffix` -Defaults to ```8.x``` which means that the latest NodeSource 8.x release -is installed. If you wish to install a 9.x release or greater, you will +Defaults to ```12.x``` which means that the latest NodeSource 12.x release +is installed. If you wish to install a 13.x release or greater, you will need to set this value accordingly. This parameter is a just a reflection of the NodeSource URL structure - NodeSource might remove old versions (such as 0.10 and 0.12) or add new ones (such as 20.x) at any time. diff --git a/manifests/params.pp b/manifests/params.pp index 64c1c59a..25bb72d3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -11,7 +11,7 @@ $repo_proxy_password = 'absent' $repo_proxy_username = 'absent' $repo_release = undef - $repo_url_suffix = '8.x' + $repo_url_suffix = '12.x' $use_flags = ['npm', 'snapshot'] $cmd_exe_path = $facts['os']['family'] ? { diff --git a/spec/classes/nodejs_spec.rb b/spec/classes/nodejs_spec.rb index 69142717..534ba467 100644 --- a/spec/classes/nodejs_spec.rb +++ b/spec/classes/nodejs_spec.rb @@ -310,15 +310,15 @@ if operatingsystemrelease =~ %r{^[6-7]\.(\d+)} operatingsystem = 'CentOS' dist_type = 'el' - repo_baseurl = "https://rpm.nodesource.com/pub_8.x/#{dist_type}/#{operatingsystemmajrelease}/\$basearch" - repo_source_baseurl = "https://rpm.nodesource.com/pub_8.x/#{dist_type}/#{operatingsystemmajrelease}/SRPMS" + repo_baseurl = "https://rpm.nodesource.com/pub_12.x/#{dist_type}/#{operatingsystemmajrelease}/\$basearch" + repo_source_baseurl = "https://rpm.nodesource.com/pub_12.x/#{dist_type}/#{operatingsystemmajrelease}/SRPMS" repo_descr = "Node.js Packages for Enterprise Linux #{operatingsystemmajrelease} - \$basearch" repo_source_descr = "Node.js for Enterprise Linux #{operatingsystemmajrelease} - \$basearch - Source" else operatingsystem = 'Fedora' dist_type = 'fc' - repo_baseurl = "https://rpm.nodesource.com/pub_8.x/#{dist_type}/#{operatingsystemmajrelease}/\$basearch" - repo_source_baseurl = "https://rpm.nodesource.com/pub_8.x/#{dist_type}/#{operatingsystemmajrelease}/SRPMS" + repo_baseurl = "https://rpm.nodesource.com/pub_12.x/#{dist_type}/#{operatingsystemmajrelease}/\$basearch" + repo_source_baseurl = "https://rpm.nodesource.com/pub_12.x/#{dist_type}/#{operatingsystemmajrelease}/SRPMS" repo_descr = "Node.js Packages for Fedora Core #{operatingsystemmajrelease} - \$basearch" repo_source_descr = "Node.js for Fedora Core #{operatingsystemmajrelease} - \$basearch - Source" end @@ -1120,8 +1120,8 @@ } end - repo_baseurl = 'https://rpm.nodesource.com/pub_8.x/el/7/$basearch' - repo_source_baseurl = 'https://rpm.nodesource.com/pub_8.x/el/7/SRPMS' + repo_baseurl = 'https://rpm.nodesource.com/pub_12.x/el/7/$basearch' + repo_source_baseurl = 'https://rpm.nodesource.com/pub_12.x/el/7/SRPMS' repo_descr = 'Node.js Packages for Enterprise Linux 7 - $basearch' repo_source_descr = 'Node.js for Enterprise Linux 7 - $basearch - Source'