Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use apt keyring on Debian #189

Merged
merged 2 commits into from
Jun 16, 2024
Merged

Use apt keyring on Debian #189

merged 2 commits into from
Jun 16, 2024

Conversation

jonhattan
Copy link
Contributor

@jonhattan jonhattan commented Apr 11, 2024

Pull Request (PR) description

Indirectly use apt::keyring instead of apt::key (deprecated) by passing name istead of id in apt::source's key subkey.

This is almost the same fix as #188 but that other is wrong because the gpg key filename must use .asc extension since gitlab provided one is ascii armored.

@traylenator
Copy link
Contributor

Requires #191

@yakatz
Copy link
Contributor

yakatz commented May 19, 2024

Now that #191 is merged, does this need to be rebased before the tests can pass or should we be able to just trigger them again?

@TheMeier
Copy link

Please rebase, I think there is also some tests you need to adapt.
See https://voxpupuli.org/docs/how_to_run_tests/ fro running the tests locally

@yakatz
Copy link
Contributor

yakatz commented May 19, 2024

@jonhattan Can you rebase?

@jonhattan
Copy link
Contributor Author

Rebased. I don't know how to fix the test. IMO $repo_keyserver is no longer needed. Any guidance?

@yakatz
Copy link
Contributor

yakatz commented May 19, 2024

Something like

is_expected.to contain_apt__source('apt_gitlabci').with_key('name' => 'gitlab_ci_runner.asc', 'source' => 'https://packages.gitlab.com/gpg.key')

should do it.

@TheMeier
Copy link

Please remove the refrence to #188 from the first comment, that is a pull request not an issue

@jonhattan
Copy link
Contributor Author

I think it is ready now

@yakatz yakatz merged commit 41b7f3b into voxpupuli:master Jun 16, 2024
30 checks passed
@yakatz yakatz mentioned this pull request Jun 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants