Update docker configuration files
- Mount user configuration files in docker composer file - Replace Dockerfile ENTRYPOINT directive with CMD one - Update docker compose services configurations Change-Id: Ie021c2d361c83073ba6d9e7f79cc620bcb468ec5
This commit is contained in:
parent
2845fbd8af
commit
e3bb3a7be1
@ -78,4 +78,4 @@ COPY --from=install /usr/local /usr/local/
|
|||||||
ADD tools/ ${TOBIKO_DIR}/tools/
|
ADD tools/ ${TOBIKO_DIR}/tools/
|
||||||
|
|
||||||
WORKDIR ${TOBIKO_DIR}
|
WORKDIR ${TOBIKO_DIR}
|
||||||
ENTRYPOINT tools/run_tests.py ${OS_TEST_PATH}
|
CMD tools/run_tests.py ${OS_TEST_PATH}
|
||||||
|
@ -12,11 +12,8 @@ services:
|
|||||||
TOX_REPORT_NAME: tobiko_results_unit
|
TOX_REPORT_NAME: tobiko_results_unit
|
||||||
volumes:
|
volumes:
|
||||||
- ./report:/report
|
- ./report:/report
|
||||||
|
- .:/tobiko
|
||||||
shell:
|
- ~/.ssh:/root/.ssh
|
||||||
extends:
|
|
||||||
service: unit
|
|
||||||
entrypoint: /bin/bash
|
|
||||||
|
|
||||||
functional:
|
functional:
|
||||||
extends:
|
extends:
|
||||||
@ -25,23 +22,30 @@ services:
|
|||||||
OS_TEST_PATH: tobiko/tests/functional
|
OS_TEST_PATH: tobiko/tests/functional
|
||||||
TOX_REPORT_NAME: tobiko_results_functional
|
TOX_REPORT_NAME: tobiko_results_functional
|
||||||
|
|
||||||
create:
|
create-workloads:
|
||||||
extends:
|
extends:
|
||||||
service: unit
|
service: unit
|
||||||
environment:
|
environment:
|
||||||
OS_TEST_PATH: tobiko/tests/scenario
|
OS_TEST_PATH: tobiko/tests/scenario
|
||||||
TOX_REPORT_NAME: tobiko_results_create
|
TOX_REPORT_NAME: tobiko_results_create_workloads
|
||||||
|
|
||||||
disrupt:
|
disrupt-services:
|
||||||
extends:
|
extends:
|
||||||
service: unit
|
service: unit
|
||||||
environment:
|
environment:
|
||||||
OS_TEST_PATH: tobiko/tests/faults
|
OS_TEST_PATH: tobiko/tests/faults
|
||||||
TOX_REPORT_NAME: tobiko_results_disrupt
|
TOX_REPORT_NAME: tobiko_results_disrupt_services
|
||||||
|
|
||||||
verify:
|
verify-workloads:
|
||||||
extends:
|
extends:
|
||||||
service: create
|
service: create-workloads
|
||||||
environment:
|
environment:
|
||||||
PREVENT_CREATE: 'true'
|
PREVENT_CREATE: 'true'
|
||||||
TOX_REPORT_NAME: tobiko_results_verify
|
TOX_REPORT_NAME: tobiko_results_verify_workloads
|
||||||
|
|
||||||
|
verify-services:
|
||||||
|
extends:
|
||||||
|
service: unit
|
||||||
|
environment:
|
||||||
|
OS_TEST_PATH: tobiko/tests/sanity
|
||||||
|
TOX_REPORT_NAME: tobiko_results_verify_services
|
||||||
|
Loading…
Reference in New Issue
Block a user