This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch tristan/remote-cache-testing in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit b51aa860b181fe76a8e20a28d52e57f4ee8f45d5 Author: Tristan van Berkom <[email protected]> AuthorDate: Wed Jan 20 21:22:13 2021 +0900 .github: Refactor how we run the remote execution test Add the remote execution client side service to ci.docker-compose.yml instead of having a separate file for this, this improves code reuse. --- .github/compose/ci.docker-compose.yml | 18 ++++++++++++++ .github/compose/ci.remote-execution-test.yml | 36 ---------------------------- .github/workflows/ci.yml | 2 +- 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 0a0da86..88ab894 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -58,6 +58,24 @@ services: environment: BST_PLUGINS_EXPERIMENTAL_VERSION: master + remote-execution: + <<: *tests-template + command: tox -vvvvv -- --color=yes --remote-execution + environment: + TOXENV: ${CI_TOXENV_MAIN} + ARTIFACT_CACHE_SERVICE: http://localhost:50052 + REMOTE_EXECUTION_SERVICE: http://localhost:50051 + SOURCE_CACHE_SERVICE: http://localhost:50052 + + # The ci.remote-execution-cluster.yml takes care of bringing up + # a remote execution cluster, exposing the ports 50052 and 50051 + # on the localhost network. + # + # We need to use host networking mode in order to be able to + # properly resolve these services. + # + network_mode: host + docs: <<: *tests-template command: tox -e docs diff --git a/.github/compose/ci.remote-execution-test.yml b/.github/compose/ci.remote-execution-test.yml deleted file mode 100644 index 976142b..0000000 --- a/.github/compose/ci.remote-execution-test.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: '3.4' - -services: - - test: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${CI_IMAGE_VERSION:-latest} - command: tox -vvvvv -- --color=yes --remote-execution - environment: - TOXENV: ${CI_TOXENV_MAIN} - ARTIFACT_CACHE_SERVICE: http://localhost:50052 - REMOTE_EXECUTION_SERVICE: http://localhost:50051 - SOURCE_CACHE_SERVICE: http://localhost:50052 - - # Some of the remote execution tests still require running a local sandbox - # to run `bst shell` on some build results even though they were built - # remotely, so we need to enable priviledged mode for this container as well. - # - privileged: true - devices: - - /dev/fuse:/dev/fuse - - # Mount the local directory and set the working directory - # to run the tests from. - # - volumes: - - ../..:/home/testuser/buildstream - working_dir: /home/testuser/buildstream - - # The ci.remote-execution-cluster.yml takes care of bringing up - # a remote execution cluster, exposing the ports 50052 and 50051 - # on the localhost network. - # - # We need to use host networking mode in order to be able to - # properly resolve these services. - # - network_mode: host diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2a44c8..292e497 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: run: | docker-compose \ --env-file ${GITHUB_WORKSPACE}/.github/common.env \ - --file ${GITHUB_WORKSPACE}/.github/compose/ci.remote-execution-test.yml run test + --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml run remote-execution - name: Bring down the RE cluster run: |
