From a8cf9e9e06a73c9ca79668e552a1a9c971687343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Ara=C3=B1a=20Cruz?= Date: Thu, 11 Apr 2024 09:11:07 +0200 Subject: [PATCH 1/2] Use apt keyring on Debian --- manifests/repo.pp | 2 +- spec/classes/gitlab_ci_runner_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 72cb086..70efc85 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -16,7 +16,7 @@ location => "${repo_base_url}/runner/${package_name}/${facts['os']['distro']['id'].downcase}/", repos => 'main', key => { - 'id' => 'F6403F6544A38863DAA0B6E03F01618A51312F3F', + 'name' => 'gitlab_ci_runner.asc', 'source' => $repo_keysource, 'server' => $repo_keyserver, }, diff --git a/spec/classes/gitlab_ci_runner_spec.rb b/spec/classes/gitlab_ci_runner_spec.rb index 6be5b81..fbbfe7d 100644 --- a/spec/classes/gitlab_ci_runner_spec.rb +++ b/spec/classes/gitlab_ci_runner_spec.rb @@ -373,7 +373,7 @@ location: "https://packages.gitlab.com/runner/gitlab-runner/#{facts[:lsbdistid].downcase}/", repos: 'main', key: { - 'id' => 'F6403F6544A38863DAA0B6E03F01618A51312F3F', + 'name' => 'gitlab_ci_runner.asc', 'server' => undef_value, 'source' => 'https://packages.gitlab.com/gpg.key', }, From b80f86a8354a1458a2e18bab6a4de9e878246ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Ara=C3=B1a=20Cruz?= Date: Mon, 20 May 2024 07:06:51 +0200 Subject: [PATCH 2/2] Fix manage_repo acceptance tests for Debian --- spec/classes/gitlab_ci_runner_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/classes/gitlab_ci_runner_spec.rb b/spec/classes/gitlab_ci_runner_spec.rb index fbbfe7d..0ec2caa 100644 --- a/spec/classes/gitlab_ci_runner_spec.rb +++ b/spec/classes/gitlab_ci_runner_spec.rb @@ -440,7 +440,7 @@ it { is_expected.to contain_class('gitlab_ci_runner::repo') } it do - is_expected.to contain_apt__source('apt_gitlabci').with_key('id' => 'F6403F6544A38863DAA0B6E03F01618A51312F3F', 'server' => 'keys.gnupg.net', 'source' => 'https://packages.gitlab.com/gpg.key') + is_expected.to contain_apt__source('apt_gitlabci').with_key('name' => 'gitlab_ci_runner.asc', 'source' => 'https://packages.gitlab.com/gpg.key', 'server' => 'keys.gnupg.net') end end @@ -457,7 +457,7 @@ it { is_expected.to contain_class('gitlab_ci_runner::repo') } it do - is_expected.to contain_apt__source('apt_gitlabci').with_key('id' => 'F6403F6544A38863DAA0B6E03F01618A51312F3F', 'server' => 'hkp://keys.gnupg.net:80', 'source' => 'https://packages.gitlab.com/gpg.key') + is_expected.to contain_apt__source('apt_gitlabci').with_key('name' => 'gitlab_ci_runner.asc', 'source' => 'https://packages.gitlab.com/gpg.key', 'server' => 'hkp://keys.gnupg.net:80') end end @@ -473,7 +473,7 @@ it { is_expected.to contain_class('gitlab_ci_runner::repo') } it do - is_expected.to contain_apt__source('apt_gitlabci').with_key('id' => 'F6403F6544A38863DAA0B6E03F01618A51312F3F', 'server' => 'https://keys.gnupg.net:88', 'source' => 'https://packages.gitlab.com/gpg.key') + is_expected.to contain_apt__source('apt_gitlabci').with_key('name' => 'gitlab_ci_runner.asc', 'source' => 'https://packages.gitlab.com/gpg.key', 'server' => 'https://keys.gnupg.net:88') end end end