diff options
| author | William Salmon <will.salmon@codethink.co.uk> | 2020-07-24 09:11:51 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-08-11 08:11:09 +0000 |
| commit | ae01de893d940cc061ebe5336c65236ddcd401f7 (patch) | |
| tree | 0bf4ab5eaa24884f5a9a64ed41db0c41a8045329 /.gitlab-ci.yml | |
| parent | 63607cf7b7387862b1d59e4c75f7431849832ec4 (diff) | |
| download | buildstream-ae01de893d940cc061ebe5336c65236ddcd401f7.tar.gz | |
Create template for remote tests
This moves boiler plate for remote tests in to a template to make
maintenance easier.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25b426b3d..58a6ed3c3 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 |