]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#4480] Make hammer.py work on Ubuntu 26.04
authorAndrei Pavel <andrei@isc.org>
Thu, 30 Apr 2026 09:50:11 +0000 (12:50 +0300)
committerAndrei Pavel <andrei@isc.org>
Mon, 4 May 2026 15:27:23 +0000 (18:27 +0300)
- Add 'make' to NETCONF dependencies. It's required to build libyang and sysrepo.
- sudo seems to behave differently. Add explicit PGPASSWORD.

hammer.py

index 082fd7dd6f20e12e24955d3ed657fd5059a6dd74..ac15918eb93ef144bde194abcb87c5ce75a189c7 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1724,7 +1724,7 @@ def _configure_pgsql(system, features):
     cmd += 'EOF\n"'
     execute(cmd, cwd='/tmp')
 
-    cmd = """sh -c \"cat <<EOF | sudo -u postgres psql -U keatest keatest
+    cmd = """sh -c \"cat <<EOF | sudo -u postgres env PGPASSWORD=${PGPASSWORD} psql -U keatest keatest
         ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO keatest_readonly;\n"""
     cmd += 'EOF\n"'
     env = os.environ.copy()
@@ -2076,7 +2076,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             packages.extend(['libkrb5-dev'])
 
         if 'netconf' in features:
-            packages.extend(['cmake', 'git', 'libpcre2-dev'])
+            packages.extend(['cmake', 'git', 'libpcre2-dev', 'make'])
 
         install_pkgs(packages, env=env, timeout=240, check_times=check_times)
 
@@ -2110,7 +2110,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             packages.append('googletest')
 
         if 'netconf' in features:
-            packages.extend(['cmake', 'git', 'libpcre2-dev'])
+            packages.extend(['cmake', 'git', 'libpcre2-dev', 'make'])
 
         if 'native-pkg' in features:
             packages.extend(['build-essential', 'fakeroot', 'devscripts'])