Skip to content

Commit 1496d2f

Browse files
authored
Update package naming to differentiate between minor versions (#534)
* Update package naming to differentiate between minor versions * adjust tests to new archive names * adjust tests to new archive names
1 parent 7c88fb0 commit 1496d2f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

manifests/download.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,19 @@
207207
# package name to use in destination directory for the installer
208208
case $_package_type {
209209
'bin' : {
210-
$package_name = "${java_se}-${release_major}-${os}-${arch}.bin"
210+
$package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.bin"
211211
}
212212
'rpmbin' : {
213-
$package_name = "${java_se}-${release_major}-${os}-${arch}-rpm.bin"
213+
$package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}-rpm.bin"
214214
}
215215
'rpm' : {
216-
$package_name = "${java_se}-${release_major}-${os}-${arch}.rpm"
216+
$package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm"
217217
}
218218
'tar.gz' : {
219-
$package_name = "${java_se}-${release_major}-${os}-${arch}.tar.gz"
219+
$package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.tar.gz"
220220
}
221221
default : {
222-
$package_name = "${java_se}-${release_major}-${os}-${arch}.rpm"
222+
$package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm"
223223
}
224224
}
225225

spec/defines/download_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
let(:title) { 'jdk8' }
2222

2323
it {
24-
is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
24+
is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.rpm')
2525
}
2626
end
2727

@@ -81,7 +81,7 @@
8181
let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
8282
let(:title) { 'jdk8' }
8383

84-
it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
84+
it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') }
8585
end
8686
end
8787

@@ -92,7 +92,7 @@
9292
let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
9393
let(:title) { 'jdk8' }
9494

95-
it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
95+
it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') }
9696
end
9797
end
9898

0 commit comments

Comments
 (0)