From a776706c2a3c5efb55b19273e4bbb6c81b96fa63 Mon Sep 17 00:00:00 2001 From: shedz Date: Wed, 2 Nov 2022 15:03:45 +0100 Subject: [PATCH 1/3] Update package naming to differentiate between minor versions --- manifests/download.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/download.pp b/manifests/download.pp index 63636c64..8c31fbef 100644 --- a/manifests/download.pp +++ b/manifests/download.pp @@ -207,19 +207,19 @@ # package name to use in destination directory for the installer case $_package_type { 'bin' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.bin" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.bin" } 'rpmbin' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}-rpm.bin" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}-rpm.bin" } 'rpm' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.rpm" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm" } 'tar.gz' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.tar.gz" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.tar.gz" } default : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.rpm" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm" } } From d189b6d74af38b9acfe6ce14ccf5aaeb3c64d9da Mon Sep 17 00:00:00 2001 From: shedz Date: Wed, 2 Nov 2022 15:43:37 +0100 Subject: [PATCH 2/3] adjust tests to new archive names --- spec/defines/download_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/defines/download_spec.rb b/spec/defines/download_spec.rb index 100cc86e..c1436945 100644 --- a/spec/defines/download_spec.rb +++ b/spec/defines/download_spec.rb @@ -21,7 +21,7 @@ let(:title) { 'jdk8' } it { - is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm') + is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.rpm') } end From c64920b7919094dc3dbafae24233e80ba3bfa7ed Mon Sep 17 00:00:00 2001 From: shedz Date: Wed, 2 Nov 2022 15:43:37 +0100 Subject: [PATCH 3/3] adjust tests to new archive names --- spec/defines/download_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/defines/download_spec.rb b/spec/defines/download_spec.rb index 100cc86e..f2b0c286 100644 --- a/spec/defines/download_spec.rb +++ b/spec/defines/download_spec.rb @@ -21,7 +21,7 @@ let(:title) { 'jdk8' } it { - is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm') + is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.rpm') } end @@ -81,7 +81,7 @@ let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } } let(:title) { 'jdk8' } - it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') } + it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') } end end @@ -92,7 +92,7 @@ let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } } let(:title) { 'jdk8' } - it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') } + it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') } end end