summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Smith <josh.smith@codethink.co.uk>2020-08-24 13:42:37 +0100
committerJosh Smith <josh.smith@codethink.co.uk>2020-08-26 10:41:41 +0100
commit68e356aed691d3d29a50603691c92335562220f6 (patch)
tree6b965cc598dcd7cdfd37d47933e25f17d8ccc192
parent3334bf45ad2573084e7e39aa650e290fc316fac5 (diff)
downloadbuildstream-68e356aed691d3d29a50603691c92335562220f6.tar.gz
.gitlab-ci.yml Improve remote-test usage documentation
-rw-r--r--.gitlab-ci.yml14
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"