Skip to content

Commit 37db704

Browse files
committed
Remove 3.8 repository handling
This release has been removed from the repositories.
1 parent df2565f commit 37db704

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

manifests/repo/apt.pp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,13 @@
3939

4040
# Key has changed since 3.9
4141
$repo_key_name = $release ? {
42-
'3.8' => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
43-
'3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
44-
'3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
45-
'3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
46-
default => '849512C2CA648EF425048F55C883F50CB2289A17',
42+
'3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
43+
'3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
44+
'3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
45+
default => '849512C2CA648EF425048F55C883F50CB2289A17',
4746
}
4847

49-
# Key location is different for some releases
50-
$repo_key_source = $release ? {
51-
'3.8' => "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/rsa.pub",
52-
default => "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub",
53-
}
48+
$repo_key_source = "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub"
5449

5550
# basic sanity check
5651
if $version == 'LATEST' {

spec/classes/repo_apt_spec.rb

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,6 @@
7272
)
7373
end
7474
end
75-
76-
context 'Specific Gluster release 3.8' do
77-
let :params do
78-
{
79-
release: '3.8'
80-
}
81-
end
82-
83-
it 'installs' do
84-
is_expected.to contain_apt__source('glusterfs-LATEST').with(
85-
repos: 'main',
86-
release: facts[:lsbdistcodename].to_s,
87-
key: {
88-
'id' => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
89-
'key_source' => 'https://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/rsa.pub'
90-
},
91-
location: "http://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/"
92-
)
93-
end
94-
end
95-
9675
end
9776
end
9877
end

0 commit comments

Comments
 (0)