From 37db704c8dbe83c18a00592f4b5e45f273702469 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 13 Jul 2018 15:46:16 +0200 Subject: [PATCH] Remove 3.8 repository handling This release has been removed from the repositories. --- manifests/repo/apt.pp | 15 +++++---------- spec/classes/repo_apt_spec.rb | 21 --------------------- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp index 96bd9f19..61567c98 100644 --- a/manifests/repo/apt.pp +++ b/manifests/repo/apt.pp @@ -39,18 +39,13 @@ # Key has changed since 3.9 $repo_key_name = $release ? { - '3.8' => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC', - '3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF', - '3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E', - '3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4', - default => '849512C2CA648EF425048F55C883F50CB2289A17', + '3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF', + '3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E', + '3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4', + default => '849512C2CA648EF425048F55C883F50CB2289A17', } - # Key location is different for some releases - $repo_key_source = $release ? { - '3.8' => "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/rsa.pub", - default => "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub", - } + $repo_key_source = "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub" # basic sanity check if $version == 'LATEST' { diff --git a/spec/classes/repo_apt_spec.rb b/spec/classes/repo_apt_spec.rb index 4536e46c..f737d10e 100644 --- a/spec/classes/repo_apt_spec.rb +++ b/spec/classes/repo_apt_spec.rb @@ -72,27 +72,6 @@ ) end end - - context 'Specific Gluster release 3.8' do - let :params do - { - release: '3.8' - } - end - - it 'installs' do - is_expected.to contain_apt__source('glusterfs-LATEST').with( - repos: 'main', - release: facts[:lsbdistcodename].to_s, - key: { - 'id' => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC', - 'key_source' => 'https://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/rsa.pub' - }, - location: "http://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/" - ) - end - end - end end end