From 755b6f22fefca6d91db0aa5f218f5222f7b8c277 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Wed, 27 Mar 2024 14:05:37 +0100 Subject: [PATCH] switch tests to Solr 9.4.1 --- README.md | 8 ++++---- spec/acceptance/class_spec.rb | 4 ++-- spec/classes/solr_spec.rb | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 5dc858f..883c311 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Install Solr with default settings and start the service afterwards: ```puppet class { 'solr': - version => '9.0.0', + version => '9.4.1', } ``` @@ -55,7 +55,7 @@ Furthermore, a number of simple options are available: ```puppet class { 'solr': - version => '9.0.0', + version => '9.4.1', # Allow automatic upgrades (when changing $version) upgrade => true, @@ -97,7 +97,7 @@ This module makes it pretty easy to configure Solr Cloud: ```puppet class { 'solr': - version => '9.0.0', + version => '9.4.1', # Setup Solr cloud cloud => true, zk_chroot => 'foo', @@ -113,7 +113,7 @@ When using Solr Cloud, you may use this module to manage your [custom plugins](h ```puppet class { 'solr': - version => '9.0.0', + version => '9.4.1', # Setup Solr cloud cloud => true, ... diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 81f6e73..1128d43 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper_acceptance' describe 'solr class' do - let(:solr_version) { '9.0.0' } + let(:solr_version) { '9.4.1' } before(:all) do apply_manifest(%( @@ -72,7 +72,7 @@ class { 'solr': let(:pp) do <<-MANIFEST class { 'solr': - version => '9.0.0', + version => '9.4.1', # Use 'localhost' for acceptance tests. solr_host => 'localhost', # Use Apache Archive, because "old" releases get removed diff --git a/spec/classes/solr_spec.rb b/spec/classes/solr_spec.rb index 31deaa1..4fd5c4f 100644 --- a/spec/classes/solr_spec.rb +++ b/spec/classes/solr_spec.rb @@ -11,7 +11,7 @@ context 'solr class without optional parameters' do let(:params) do { - version: '9.0.0', + version: '9.4.1', } end @@ -32,10 +32,10 @@ end it { - is_expected.to contain_archive('/opt/staging/solr-9.0.0.tgz').with( + is_expected.to contain_archive('/opt/staging/solr-9.4.1.tgz').with( extract_path: '/opt/staging', - source: 'https://dlcdn.apache.org/solr/solr/9.0.0/solr-9.0.0.tgz', - creates: '/opt/staging/solr-9.0.0', + source: 'https://dlcdn.apache.org/solr/solr/9.4.1/solr-9.4.1.tgz', + creates: '/opt/staging/solr-9.4.1', ) } it { @@ -47,10 +47,10 @@ } it { is_expected.to contain_exec('run solr install script').with( - command: '/opt/staging/solr-9.0.0/bin/install_solr_service.sh /opt/staging/solr-9.0.0.tgz -i /opt -d /var/solr -u solr -s solr -p 8983 -n ', - cwd: '/opt/staging/solr-9.0.0', - creates: '/opt/solr-9.0.0', - ).that_requires('Archive[/opt/staging/solr-9.0.0.tgz]') + command: '/opt/staging/solr-9.4.1/bin/install_solr_service.sh /opt/staging/solr-9.4.1.tgz -i /opt -d /var/solr -u solr -s solr -p 8983 -n ', + cwd: '/opt/staging/solr-9.4.1', + creates: '/opt/solr-9.4.1', + ).that_requires('Archive[/opt/staging/solr-9.4.1.tgz]') } it { is_expected.to contain_file('/var/solr').with( @@ -82,7 +82,7 @@ is_expected.to contain_file('/var/solr/solr.in.sh').with_content(%r{SOLR_PORT=8983}) } it { - is_expected.to contain_file('/opt/solr-9.0.0/server/resources/log4j2.xml').with( + is_expected.to contain_file('/opt/solr-9.4.1/server/resources/log4j2.xml').with( ensure: 'file', mode: '0644', owner: 'solr', @@ -115,7 +115,7 @@ let(:params) do { manage_service_limits: false, - version: '9.0.0', + version: '9.4.1', } end @@ -130,7 +130,7 @@ let(:params) do { enable_prometheus_exporter: true, - version: '9.0.0', + version: '9.4.1', } end @@ -181,7 +181,7 @@ { enable_prometheus_exporter: true, prometheus_exporter_env_vars: { 'JAVA_HEAP': '128m' }, - version: '9.0.0', + version: '9.4.1', } end