summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/1-node.yml2
-rw-r--r--tests/2-nodes-vpp-memif-replication.yml22
-rw-r--r--tests/2-nodes.yml2
3 files changed, 8 insertions, 18 deletions
diff --git a/tests/1-node.yml b/tests/1-node.yml
index 515ca6871..eb8c19f34 100644
--- a/tests/1-node.yml
+++ b/tests/1-node.yml
@@ -4,6 +4,8 @@ services:
build:
context: ..
dockerfile: ${DOCKERFILE}
+ args:
+ - BASE_IMAGE
image: hicn-base
privileged: true
container_name: forwarder
diff --git a/tests/2-nodes-vpp-memif-replication.yml b/tests/2-nodes-vpp-memif-replication.yml
index 9fbb57a40..54b9840ad 100644
--- a/tests/2-nodes-vpp-memif-replication.yml
+++ b/tests/2-nodes-vpp-memif-replication.yml
@@ -1,18 +1,11 @@
version: "3"
services:
- vpp_client_memif:
- build:
- context: ..
- dockerfile: ${DOCKERFILE}
- stdin_open: true
- tty: true
- working_dir: /workspace
+ client:
container_name: ${TEST_VPP_MEMIF_REPLICATION}-client
- hostname: client
+ networks: []
volumes:
- /tmp/memif:/memif:z
- ..:/workspace:z
- entrypoint: [/bin/bash, -c]
command:
- |
if [ -d /workspace/build-dev ]; then
@@ -69,19 +62,12 @@ services:
sudo vppctl hicn strategy set 2 prefix b002::/64
tail -f /dev/null
- vpp_server_memif:
- build:
- context: ..
- dockerfile: ${DOCKERFILE}
- stdin_open: true
- tty: true
- working_dir: /workspace
+ server:
container_name: ${TEST_VPP_MEMIF_REPLICATION}-server
- hostname: server
+ networks: []
volumes:
- /tmp/memif:/memif:z
- ..:/workspace:z
- entrypoint: [/bin/bash, -c]
command:
- |
if [ -d /workspace/build-dev ]; then
diff --git a/tests/2-nodes.yml b/tests/2-nodes.yml
index 064ed5453..05a69359e 100644
--- a/tests/2-nodes.yml
+++ b/tests/2-nodes.yml
@@ -4,6 +4,8 @@ services:
build:
context: ..
dockerfile: ${DOCKERFILE}
+ args:
+ - BASE_IMAGE
privileged: true
stdin_open: true
hostname: client