From 58cad0e00e59865846872c37020090eb858796e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 20 May 2021 11:27:10 +0200 Subject: [PATCH 1/5] _artifactelement.py: Remove unused Artifact import --- src/buildstream/_artifactelement.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/buildstream/_artifactelement.py b/src/buildstream/_artifactelement.py index cf7f55d93..4d482cac8 100644 --- a/src/buildstream/_artifactelement.py +++ b/src/buildstream/_artifactelement.py @@ -24,7 +24,6 @@ from . import Element from . import _cachekey -from ._artifact import Artifact from ._artifactproject import ArtifactProject from ._exceptions import ArtifactElementError from ._loader import LoadElement From ea17f549f362fa7e47d03e8f5ec2b2d3ed91fd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 20 May 2021 11:27:30 +0200 Subject: [PATCH 2/5] _assetcache.py: Remove unused MappingNode import --- src/buildstream/_assetcache.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/buildstream/_assetcache.py b/src/buildstream/_assetcache.py index e096c5f72..1435969f4 100644 --- a/src/buildstream/_assetcache.py +++ b/src/buildstream/_assetcache.py @@ -22,7 +22,6 @@ import grpc from . import utils -from .node import MappingNode from ._cas import CASRemote, CASCache from ._exceptions import AssetCacheError, RemoteError from ._remotespec import RemoteSpec, RemoteType From 88e29edcfab6af7307bd897c1224aaba673cd5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 20 May 2021 17:04:45 +0200 Subject: [PATCH 3/5] _cas/casserver.py: Fix --log-level default value with Click 8.0 This fixes the following error with Click 8.0: Error: Invalid value for '--log-level': is not one of 'warning', 'info', 'trace'. --- src/buildstream/_cas/casserver.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/buildstream/_cas/casserver.py b/src/buildstream/_cas/casserver.py index 04c5eb836..5ddd446f2 100644 --- a/src/buildstream/_cas/casserver.py +++ b/src/buildstream/_cas/casserver.py @@ -75,6 +75,9 @@ def __init__(self): super().__init__([m.lower() for m in LogLevel.Levels._member_names_]) # pylint: disable=no-member def convert(self, value, param, ctx) -> "LogLevel.Levels": + if isinstance(value, LogLevel.Levels): + value = value.value + return LogLevel.Levels(super().convert(value, param, ctx)) @classmethod From 4b42c1584da86c06df21e2ee26b41ce539abdc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 20 May 2021 17:14:48 +0200 Subject: [PATCH 4/5] .github: Work around bst-artifact-server bug in Docker image bst-artifact-server fails with the default value of `--log-level` due to an incompatibility with Click 8.0. Work around the issue until the Docker image is rebuilt with the fix. --- .github/compose/ci.buildstream-remote-cache.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/compose/ci.buildstream-remote-cache.yml b/.github/compose/ci.buildstream-remote-cache.yml index 9f853fa66..6736ca367 100644 --- a/.github/compose/ci.buildstream-remote-cache.yml +++ b/.github/compose/ci.buildstream-remote-cache.yml @@ -19,8 +19,9 @@ version: "3.2" services: controller: image: buildstream/buildstream:dev - command: ["bst-artifact-server","--port", - "50052", + command: ["bst-artifact-server", + "--log-level", "warning", + "--port", "50052", "--enable-push", "/artifacts" ] From 04f14f986973699f7b4c17f6bf2445344fb30afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Tue, 18 May 2021 11:47:21 +0200 Subject: [PATCH 5/5] .github: Rename remote service tests in CI There is one CI job for each remote service, which should run all applicable tests against that particular service. Consistently use the name of the remote service as CI job name to clarify this and prepare for additional tests. --- ...ldstream-remote-cache.yml => ci.bst-artifact-server.yml} | 4 ++-- .../{ci.buildbarn-remote-cache.yml => ci.buildbarn.yml} | 4 ++-- .../compose/{ci.remote-execution.yml => ci.buildgrid.yml} | 4 ++-- .github/compose/ci.docker-compose.yml | 6 +++--- .github/workflows/ci.yml | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename .github/compose/{ci.buildstream-remote-cache.yml => ci.bst-artifact-server.yml} (83%) rename .github/compose/{ci.buildbarn-remote-cache.yml => ci.buildbarn.yml} (90%) rename .github/compose/{ci.remote-execution.yml => ci.buildgrid.yml} (94%) diff --git a/.github/compose/ci.buildstream-remote-cache.yml b/.github/compose/ci.bst-artifact-server.yml similarity index 83% rename from .github/compose/ci.buildstream-remote-cache.yml rename to .github/compose/ci.bst-artifact-server.yml index 6736ca367..879e5ca6e 100644 --- a/.github/compose/ci.buildstream-remote-cache.yml +++ b/.github/compose/ci.bst-artifact-server.yml @@ -11,8 +11,8 @@ # push: true # # Basic usage: -# - docker-compose -f ci.buildstream-remote-cache.yml up -# - docker-compose -f ci.buildstream-remote-cache.yml down +# - docker-compose -f ci.bst-artifact-server.yml up +# - docker-compose -f ci.bst-artifact-server.yml down # version: "3.2" diff --git a/.github/compose/ci.buildbarn-remote-cache.yml b/.github/compose/ci.buildbarn.yml similarity index 90% rename from .github/compose/ci.buildbarn-remote-cache.yml rename to .github/compose/ci.buildbarn.yml index 349a289b5..c1e90e9a7 100644 --- a/.github/compose/ci.buildbarn-remote-cache.yml +++ b/.github/compose/ci.buildbarn.yml @@ -16,8 +16,8 @@ # push: true # # Basic usage: -# - docker-compose -f ci.buildbarn-remote-cache.yml up -# - docker-compose -f ci.buildbarn-remote-cache.yml down +# - docker-compose -f ci.buildbarn.yml up +# - docker-compose -f ci.buildbarn.yml down version: '3.4' diff --git a/.github/compose/ci.remote-execution.yml b/.github/compose/ci.buildgrid.yml similarity index 94% rename from .github/compose/ci.remote-execution.yml rename to .github/compose/ci.buildgrid.yml index e58a2a305..211c320da 100644 --- a/.github/compose/ci.remote-execution.yml +++ b/.github/compose/ci.buildgrid.yml @@ -19,8 +19,8 @@ # url: http://localhost:50051 # # Basic usage: -# - docker-compose -f ci.remote-execution.yml up -# - docker-compose -f ci.remote-execution.yml down +# - docker-compose -f ci.buildgrid.yml up +# - docker-compose -f ci.buildgrid.yml down # version: "3.2" diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 2ef1a2456..ee8d8c841 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -58,7 +58,7 @@ services: environment: BST_PLUGINS_EXPERIMENTAL_VERSION: master - remote-execution: + buildgrid: <<: *tests-template command: tox -vvvvv -- --color=yes --remote-execution environment: @@ -72,7 +72,7 @@ services: # network_mode: host - buildstream-remote-cache: + bst-artifact-server: <<: *tests-template command: tox -vvvvv -- --color=yes --remote-cache environment: @@ -84,7 +84,7 @@ services: # network_mode: host - buildbarn-remote-cache: + buildbarn: <<: *tests-template command: tox -vvvvv -- --color=yes --remote-cache environment: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9401b40a..894caaa66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,9 +87,9 @@ jobs: # and they also map to corresponding filenames of services which are expected # to be run in the background test-name: - - remote-execution - - buildstream-remote-cache - - buildbarn-remote-cache + - bst-artifact-server + - buildbarn + - buildgrid steps: - name: Check out repository