Skip to content

Commit

Permalink
feature(cluster): remove apt-key refs
Browse files Browse the repository at this point in the history
Following #5101 we can now remove the apt-key refs
  • Loading branch information
benipeled authored and fruch committed Oct 10, 2024
1 parent 131c334 commit 2bf819c
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions sdcm/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,6 @@ def download_scylla_repo(self, scylla_repo):
self.install_package('gnupg2')
self.remoter.sudo("mkdir -p /etc/apt/keyrings")
for apt_key in self.parent_cluster.params.get("scylla_apt_keys"):
self.remoter.sudo(f"apt-key adv --keyserver keyserver.ubuntu.com --recv-keys {apt_key}", retry=3)
self.remoter.sudo(f"gpg --homedir /tmp --no-default-keyring --keyring /etc/apt/keyrings/scylladb.gpg "
f"--keyserver hkp://keyserver.ubuntu.com:80 --recv-keys {apt_key}", retry=3)
self.update_repo_cache()
Expand All @@ -1812,7 +1811,6 @@ def download_scylla_manager_repo(self, scylla_repo: str) -> None:
if self.distro.is_debian_like:
self.remoter.sudo("mkdir -p /etc/apt/keyrings")
for apt_key in self.parent_cluster.params.get("scylla_apt_keys"):
self.remoter.sudo(f"apt-key adv --keyserver keyserver.ubuntu.com --recv-keys {apt_key}", retry=3)
self.remoter.sudo(f"gpg --homedir /tmp --no-default-keyring --keyring /etc/apt/keyrings/scylladb.gpg "
f"--keyserver hkp://keyserver.ubuntu.com:80 --recv-keys {apt_key}", retry=3)
self.remoter.sudo("apt-get update", ignore_status=True)
Expand Down

0 comments on commit 2bf819c

Please sign in to comment.