diff options
| author | Josh Smith <josh.smith@codethink.co.uk> | 2020-08-24 13:42:37 +0100 |
|---|---|---|
| committer | Qinusty <qinusty@gmail.com> | 2020-08-26 13:27:44 +0000 |
| commit | f3b8451cd95c9441e2a52661b94f48dbbccf8181 (patch) | |
| tree | b07989b4e517cf3575022a15bf306e1e9dea9066 /.gitlab-ci.yml | |
| parent | 93d4f0181ad51caacfdf7c5b4de5566413963224 (diff) | |
| download | buildstream-f3b8451cd95c9441e2a52661b94f48dbbccf8181.tar.gz | |
.gitlab-ci.yml Improve remote-test usage documentation
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 921557da2..18103040b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,6 +158,8 @@ tests-fedora-update-deps: - su buildstream -c "${TEST_COMMAND}" +# This template ensures that the server stack defined in COMPOSE_MANIFEST is spun up for script execution +# and cleaned up after the script is completed. .compose-test-boilerplate: &remote-test allow_failure: true image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION} @@ -179,10 +181,10 @@ tests-fedora-update-deps: tests-remote-execution: <<: *tests - <<: *remote-test + <<: *remote-test # Spin up server stack variables: <<: *docker-variables - COMPOSE_MANIFEST: .gitlab-ci/buildgrid-remote-execution.yml + COMPOSE_MANIFEST: .gitlab-ci/buildgrid-remote-execution.yml # < *remote-test ARTIFACT_CACHE_SERVICE: http://docker:50052 REMOTE_EXECUTION_SERVICE: http://docker:50051 SOURCE_CACHE_SERVICE: http://docker:50052 @@ -190,19 +192,19 @@ tests-remote-execution: tests-remote-cache: <<: *tests - <<: *remote-test + <<: *remote-test # Spin up/down server stack variables: <<: *docker-variables - COMPOSE_MANIFEST: .gitlab-ci/cache-server.yml + COMPOSE_MANIFEST: .gitlab-ci/cache-server.yml # < *remote-test ARTIFACT_CACHE_SERVICE: http://docker:50052 PYTEST_ARGS: "--color=yes --remote-cache" tests-bb-remote-cache: <<: *tests - <<: *remote-test + <<: *remote-test # Spin up/down server stack variables: <<: *docker-variables - COMPOSE_MANIFEST: .gitlab-ci/buildbarn-remote-cache.yml + COMPOSE_MANIFEST: .gitlab-ci/buildbarn-remote-cache.yml # < *remote-test ARTIFACT_INDEX_SERVICE: http://docker:7981 ARTIFACT_STORAGE_SERVICE: http://docker:7982 PYTEST_ARGS: "--color=yes --remote-cache" |