diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2022-09-13 10:58:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2022-09-13 10:58:30 +0000 |
| commit | b22de5bb26de43324419ce275272d38333c42879 (patch) | |
| tree | 930978dbc96fc67507d8380861d7076523ee7068 | |
| parent | b7f57d0f689d073340994cdade532462ca264d3b (diff) | |
| parent | 741952819d7452f7690c3ca355f42dac30b1d854 (diff) | |
Merge "fix: re-introduce BASE_IMAGE argument in docker-compose files for tests"
| -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 |