This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch willsalmon/remotecache in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit df86fc7b2f2ce35d023f608b2088c6f4551ee101 Author: William Salmon <[email protected]> AuthorDate: Fri Jul 24 09:11:51 2020 +0100 Create template for remote tests This moves boiler plate for remote tests in to a template to make maintenance easier. --- .gitlab-ci.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c89652d..0f9d6f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,10 +171,9 @@ tests-fedora-update-deps: - su buildstream -c "${TEST_COMMAND}" -tests-remote-execution: +.compose-test-boilerplate: &remote-test allow_failure: true image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION} - <<: *tests before_script: - dnf install -y docker docker-compose - docker-compose --file ${COMPOSE_MANIFEST} up --detach @@ -184,6 +183,10 @@ tests-remote-execution: - docker-compose --file ${COMPOSE_MANIFEST} down services: - docker:stable-dind + +tests-remote-execution: + <<: *tests + <<: *remote-test variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 @@ -196,18 +199,8 @@ tests-remote-execution: PYTEST_ARGS: "--color=yes --remote-execution" tests-remote-cache: - allow_failure: true - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION} <<: *tests - before_script: - - dnf install -y docker docker-compose - - docker-compose --file ${COMPOSE_MANIFEST} up --detach - after_script: - - docker-compose --file ${COMPOSE_MANIFEST} stop - - docker-compose --file ${COMPOSE_MANIFEST} logs - - docker-compose --file ${COMPOSE_MANIFEST} down - services: - - docker:stable-dind + <<: *remote-test variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2
