From 72d3e4229a8d6bffefdf0a48016ca36291fc88fd Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Wed, 19 Feb 2020 21:31:10 +0800 Subject: [PATCH] fix (install_scylla): adjust the dependency repos for debian10 There is 3rdparty repositorie for Debian 10, the installation doesn't require it. The openjdk-8-jre dependency can be solved by adoptopenjdk repositorie. This patch removed invalid 3rdparty repositorie for Debian 10, and added adoptopenjdk repositorie. Signed-off-by: Amos Kong --- sdcm/cluster.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdcm/cluster.py b/sdcm/cluster.py index 0ee55f7c51..bc043b963b 100644 --- a/sdcm/cluster.py +++ b/sdcm/cluster.py @@ -1931,10 +1931,10 @@ def install_scylla(self, scylla_repo): apt-get update apt-get install apt-transport-https -y apt-get install gnupg1-curl dirmngr -y - apt-key adv --fetch-keys https://download.opensuse.org/repositories/home:/scylladb:/scylla-3rdparty-buster/Debian_10.0/Release.key - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 17723034C56D4B19 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5E08FBD8B5D6EC9C - echo 'deb http://download.opensuse.org/repositories/home:/scylladb:/scylla-3rdparty-buster/Debian_10.0/ /' > /etc/apt/sources.list.d/scylla-3rdparty.list + curl https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - + apt-get install software-properties-common -y + add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ """) self.remoter.run('sudo bash -cxe "%s"' % install_debian_10_prereqs)