]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
hammer: fixed problems with repo updated and missing args 803-hammer-py-fails-on-clean-os-due-to-latest-updates-connected-with-sphinx
authorMichal Nowikowski <godfryd@isc.org>
Tue, 6 Aug 2019 10:46:53 +0000 (12:46 +0200)
committerMichal Nowikowski <godfryd@isc.org>
Tue, 6 Aug 2019 10:46:53 +0000 (12:46 +0200)
hammer.py

index 68bad0cc2ac6a8cee2d668e01a53052a7537ce2d..8c44f448760c8ed34fab803eb4684fcb6c7605d1 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1094,7 +1094,7 @@ def prepare_system_local(features, check_times):
             _install_gtest_sources()
 
         if 'cql' in features:
-            _install_cassandra_rpm(system, env, check_times)
+            _install_cassandra_rpm(system, revision, env, check_times)
 
     # prepare rhel
     elif system == 'rhel':
@@ -1142,14 +1142,14 @@ def prepare_system_local(features, check_times):
             _install_gtest_sources()
 
         if 'cql' in features:
-            _install_cassandra_rpm(system, env, check_times)
+            _install_cassandra_rpm(system, revision, env, check_times)
 
     # prepare ubuntu
     elif system == 'ubuntu':
         _apt_update(system, revision, env=env, check_times=check_times, attempts=3, sleep_time_after_attempt=10)
 
         packages = ['gcc', 'g++', 'make', 'autoconf', 'automake', 'libtool', 'libssl-dev', 'liblog4cplus-dev',
-                    'libboost-system-dev']
+                    'libboost-system-dev', 'gnupg']
 
         if 'unittest' in features:
             if revision.startswith('16.'):
@@ -1192,7 +1192,7 @@ def prepare_system_local(features, check_times):
         _apt_update(system, revision, env=env, check_times=check_times, attempts=3, sleep_time_after_attempt=10)
 
         packages = ['gcc', 'g++', 'make', 'autoconf', 'automake', 'libtool', 'libssl-dev',
-                    'liblog4cplus-dev', 'libboost-system-dev']
+                    'liblog4cplus-dev', 'libboost-system-dev', 'gnupg']
 
         if 'unittest' in features:
             if revision == '8':