make/Makefile: allow overriding '-it' for target 'run'
Allocating a pseudo-TTY (-t, --tty) fails when 'run' is executed inside of a Jenkins or cron script. This change fixes ttcn3-bts-test, which invokes 'run' to fetch the config files. Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Fixes: If15461240f3037c142c176fc7da745a1701ae3f8
This commit is contained in:
parent
8e3b3ff43c
commit
44393058f6
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
RUN_ARGS?= \
|
RUN_ARGS?= \
|
||||||
|
-it --rm \
|
||||||
--privileged \
|
--privileged \
|
||||||
-v /dev/bus/usb:/dev/bus/usb
|
-v /dev/bus/usb:/dev/bus/usb
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@ OSMO_SIP_BRANCH?=master
|
||||||
OSMO_STP_BRANCH?=master
|
OSMO_STP_BRANCH?=master
|
||||||
OPEN5GS_BRANCH?=main
|
OPEN5GS_BRANCH?=main
|
||||||
BUILD_ARGS?=
|
BUILD_ARGS?=
|
||||||
|
RUN_ARGS?=-it
|
||||||
UPSTREAM_DISTRO?=debian:bullseye
|
UPSTREAM_DISTRO?=debian:bullseye
|
||||||
DISTRO?=debian-bullseye
|
DISTRO?=debian-bullseye
|
||||||
|
|
||||||
|
@ -167,4 +168,4 @@ major-release: tag-major-release release
|
||||||
|
|
||||||
|
|
||||||
run:
|
run:
|
||||||
docker run $(RUN_ARGS) -it $(IMAGE) $(RUN_CMD)
|
docker run $(RUN_ARGS) $(IMAGE) $(RUN_CMD)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.7.2
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.7.2
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.6.3
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.6.3
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
DATA_DIR?=$(shell pwd)
|
DATA_DIR?=$(shell pwd)
|
||||||
USER_ID?=$(shell id -u)
|
USER_ID?=$(shell id -u)
|
||||||
RUN_ARGS=-v $(DATA_DIR):/data --user $(USER_ID) --network host --rm
|
RUN_ARGS=-it --rm -v $(DATA_DIR):/data --user $(USER_ID) --network host
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
RUN_ARGS?= \
|
RUN_ARGS?= \
|
||||||
|
-it --rm \
|
||||||
--privileged \
|
--privileged \
|
||||||
-v /dev/bus/usb:/dev/bus/usb
|
-v /dev/bus/usb:/dev/bus/usb
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--tmpfs /tmpfs:exec
|
RUN_ARGS?=-it --tmpfs /tmpfs:exec
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
RUN_ARGS?= \
|
RUN_ARGS?= \
|
||||||
--rm \
|
-it --rm \
|
||||||
--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
|
--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
|
||||||
--sysctl net.ipv6.conf.all.disable_ipv6=0 \
|
--sysctl net.ipv6.conf.all.disable_ipv6=0 \
|
||||||
--sysctl net.ipv6.conf.all.forwarding=1 \
|
--sysctl net.ipv6.conf.all.forwarding=1 \
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
RUN_ARGS?= \
|
RUN_ARGS?= \
|
||||||
--rm \
|
-it --rm \
|
||||||
--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
|
--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
|
||||||
--sysctl net.ipv6.conf.all.disable_ipv6=0 \
|
--sysctl net.ipv6.conf.all.disable_ipv6=0 \
|
||||||
--sysctl net.ipv6.conf.all.forwarding=1 \
|
--sysctl net.ipv6.conf.all.forwarding=1 \
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data
|
RUN_ARGS?=-it --rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
|
||||||
include ../../../make/Makefile
|
include ../../../make/Makefile
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.201 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.201 -v bsc-vol:/data
|
||||||
include ../../../make/Makefile
|
include ../../../make/Makefile
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
|
||||||
include ../../../make/Makefile
|
include ../../../make/Makefile
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
|
||||||
include ../../../make/Makefile
|
include ../../../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
|
#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
|
#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm
|
RUN_ARGS?=-it --rm
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.18.0.3
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.3
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data
|
RUN_ARGS?=-it --rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
|
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
|
||||||
|
|
||||||
include ../make/Makefile
|
include ../make/Makefile
|
||||||
|
|
Loading…
Reference in New Issue