diff options
author | William Salmon <will.salmon@codethink.co.uk> | 2020-07-23 17:31:04 +0100 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-08-11 08:11:09 +0000 |
commit | 63607cf7b7387862b1d59e4c75f7431849832ec4 (patch) | |
tree | 8a8577b332b86ba2b1f4b81d5c82232b5eb4b167 | |
parent | 46e92ead4ca2878c289fb72a62865d16d916f82a (diff) | |
download | buildstream-63607cf7b7387862b1d59e4c75f7431849832ec4.tar.gz |
Test buildstream with a reference cache server
This test defines a docker compose for a buildstream cache server and
uses it.
This stage could be altered or duplicated to use other cache servers so we
can check our continued compatibility.
-rw-r--r-- | .gitlab-ci.yml | 24 | ||||
-rw-r--r-- | .gitlab-ci/buildgrid-remote-execution.yml (renamed from .gitlab-ci/buildgrid-compose.yml) | 0 | ||||
-rw-r--r-- | .gitlab-ci/cache-server.yml | 36 |
3 files changed, 59 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02c7f6155..25b426b3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -189,12 +189,34 @@ tests-remote-execution: DOCKER_DRIVER: overlay2 # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 DOCKER_TLS_CERTDIR: "" - COMPOSE_MANIFEST: .gitlab-ci/buildgrid-compose.yml + COMPOSE_MANIFEST: .gitlab-ci/buildgrid-remote-execution.yml ARTIFACT_CACHE_SERVICE: http://docker:50052 REMOTE_EXECUTION_SERVICE: http://docker:50051 SOURCE_CACHE_SERVICE: http://docker:50052 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 + variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_DRIVER: overlay2 + # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 + DOCKER_TLS_CERTDIR: "" + COMPOSE_MANIFEST: .gitlab-ci/cache-server.yml + ARTIFACT_CACHE_SERVICE: http://docker:50052 + PYTEST_ARGS: "--color=yes --remote-cache" + tests-no-usedevelop: # Ensure that tests also pass without `--develop` flag. image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION} diff --git a/.gitlab-ci/buildgrid-compose.yml b/.gitlab-ci/buildgrid-remote-execution.yml index fd45c45af..fd45c45af 100644 --- a/.gitlab-ci/buildgrid-compose.yml +++ b/.gitlab-ci/buildgrid-remote-execution.yml diff --git a/.gitlab-ci/cache-server.yml b/.gitlab-ci/cache-server.yml new file mode 100644 index 000000000..24ccd1672 --- /dev/null +++ b/.gitlab-ci/cache-server.yml @@ -0,0 +1,36 @@ +## +# A Builstream Artifact Server +# +# Spins-up a unnamed and unauthenticated grid: +# - artifacts server at: http://localhost:50052 +# +# BuildStream configuration snippet: +# +# artifacts: +# url: http://localhost:50052 +# push: true +# +# Basic usage: +# - docker-compose -f cache-server.yml up +# - docker-compose -f cache-server.yml down +# +version: "3.2" + +services: + controller: + image: buildstream/buildstream:dev + command: ["bst-artifact-server","--port", + "50052", + "--enable-push", + "/artifacts" + ] + ports: + - 50052:50052 + networks: + - grid +networks: + grid: + driver: bridge + +volumes: + cache: |