diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2022-09-12 17:05:43 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2022-09-13 09:04:47 +0000 |
| commit | 741952819d7452f7690c3ca355f42dac30b1d854 (patch) | |
| tree | 1a74966196fcc51682c203348df71c7fdcfaaf52 | |
| parent | 6ee6b65ef03f8a479cccb2ae04e6b156f309f045 (diff) | |
fix: re-introduce BASE_IMAGE argument in docker-compose files for tests
Ref: HICN-732
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I26ab4e0630d143bd429dc44318868667a155ed12
| -rw-r--r-- | tests/1-node.yml | 2 | ||||
| -rw-r--r-- | tests/2-nodes-vpp-memif-replication.yml | 22 | ||||
| -rw-r--r-- | tests/2-nodes.yml | 2 |
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 |