aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/jenkins-build-osmo-hnbgw.sh (renamed from contrib/jenkins-build-osmo-iuh.sh)5
-rw-r--r--src/osmo_gsm_tester/core/util.py4
-rwxr-xr-xsysmocom/ttcn3/jenkins-run.sh2
3 files changed, 6 insertions, 5 deletions
diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-hnbgw.sh
index 412110e..c495c21 100755
--- a/contrib/jenkins-build-osmo-iuh.sh
+++ b/contrib/jenkins-build-osmo-hnbgw.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -e -x
base="$PWD"
-name="osmo-iuh"
+name="osmo-hnbgw"
. "$(dirname "$0")/jenkins-build-common.sh"
build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
@@ -9,7 +9,8 @@ build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi
build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
build_repo libosmo-sccp ${SANITIZE_FLAGS}
build_repo libasn1c ${SANITIZE_FLAGS}
-
build_repo osmo-iuh ${SANITIZE_FLAGS}
+build_repo osmo-hnbgw ${SANITIZE_FLAGS}
+
create_bin_tgz "osmo-hnbgw"
diff --git a/src/osmo_gsm_tester/core/util.py b/src/osmo_gsm_tester/core/util.py
index 691b489..5ca6ad9 100644
--- a/src/osmo_gsm_tester/core/util.py
+++ b/src/osmo_gsm_tester/core/util.py
@@ -102,7 +102,7 @@ def setcap_net_admin(binary, run_dir):
proc = Process(SETCAP_NET_ADMIN_BIN, run_dir, ['sudo', SETCAP_NET_ADMIN_BIN, binary])
proc.launch_sync()
-def setcap_netsys_admin(self, binary, run_dir):
+def setcap_netsys_admin(binary, run_dir):
'''
This functionality requires specific setup on the host running
osmo-gsm-tester. See osmo-gsm-tester manual for more information.
@@ -118,7 +118,7 @@ def create_netns(netns, run_dir):
'''
from .process import Process
NETNS_SETUP_BIN = 'osmo-gsm-tester_netns_setup.sh'
- proc = Process('create_netns', ('sudo', NETNS_SETUP_BIN, netns))
+ proc = Process('create_netns',run_dir, ['sudo', NETNS_SETUP_BIN, netns])
proc.launch_sync()
def move_iface_to_netns(ifname, netns, run_dir):
diff --git a/sysmocom/ttcn3/jenkins-run.sh b/sysmocom/ttcn3/jenkins-run.sh
index 1688b88..faa9aad 100755
--- a/sysmocom/ttcn3/jenkins-run.sh
+++ b/sysmocom/ttcn3/jenkins-run.sh
@@ -25,7 +25,7 @@ prepare_docker() {
PWD=$OLDPWD
}
-docker pull registry.sysmocom.de/ttcn3-bts-test
+docker pull registry.osmocom.org/ttcn3-bts-test
# remove older trial dirs and *-run.tgz, if any
trial_dir_prefix="trial-"