diff --git a/.aspect/workflows/bazelrc b/.aspect/workflows/bazelrc index 51dae69d3..2fb1561e9 100644 --- a/.aspect/workflows/bazelrc +++ b/.aspect/workflows/bazelrc @@ -1,3 +1,10 @@ # build without the bytes common --remote_download_outputs=minimal common --nobuild_runfile_links + +common:aspect_rbe --extra_execution_platforms=@aspect_bazel_lib//platforms:x86_64_linux_remote +common:aspect_rbe --host_platform=@aspect_bazel_lib//platforms:x86_64_linux_remote +common:aspect_rbe --remote_executor=unix:///mnt/ephemeral/buildbarn/.cache/bb_clientd/grpc +common:aspect_rbe --genrule_strategy=remote,local +common:aspect_rbe --jobs=32 +common:aspect_rbe --remote_timeout=3600 diff --git a/.aspect/workflows/config.yaml b/.aspect/workflows/config.yaml index a3654a63d..ec5e3b244 100644 --- a/.aspect/workflows/config.yaml +++ b/.aspect/workflows/config.yaml @@ -1,8 +1,18 @@ queue: bazel-lib-default +bazel: + flags: + - --config=aspect_rbe workspaces: .: tasks: - test: + targets: + - //... + - -//lib/tests/coreutils:ls_test # Broken on workflows CI & RBE + - -//lib/tests/tar:test_dirs # Broken on workflows CI & RBE + - configure: + bazel: + flags: [] # TODO: Aspect CLI does not support --config for configure cmd e2e/copy_action: icon: bazel tasks: diff --git a/.circleci/config.yml b/.circleci/config.yml index 0795c7190..3da36c9e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,15 +16,15 @@ workflows: - aw-buildifier: context: [] workspace: . - - aw-configure: - context: [] - workspace: . - aw-format: context: [] workspace: . - aw-gazelle: context: [] workspace: . + - aw-root_workspace_configure: + context: [] + workspace: . - aw-root_workspace_test: context: [] workspace: . @@ -208,46 +208,6 @@ jobs: no_output_timeout: 10m when: always working_directory: /mnt/ephemeral/workdir - aw-configure: - environment: - ASPECT_WORKFLOWS_CIRCLE_PIPELINE_NUMBER: << pipeline.number >> - ASPECT_WORKFLOWS_CIRCLE_PIPELINE_PROJECT_TYPE: << pipeline.project.type >> - ASPECT_WORKFLOWS_CIRCLE_WORKFLOW_BASE_NAME: aspect-workflows - ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml - ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >> - XDG_CACHE_HOME: /mnt/ephemeral/caches - machine: true - parameters: - delivery_manifest: - default: true - type: boolean - workspace: - type: string - resource_class: aspect-build/bazel-lib-small - steps: - - run: - command: /etc/aspect/workflows/bin/configure_workflows_env - name: Workflows environment - - checkout - - run: - command: rm -rf /workflows/artifacts /workflows/testlogs - name: Prepare archive directories - - run: - command: /etc/aspect/workflows/bin/agent_health_check - name: Agent health check - no_output_timeout: 180m - - run: - command: rosetta run configure --workspace << parameters.workspace >> - name: Configure - no_output_timeout: 180m - - store_artifacts: - path: /workflows/artifacts - - run: - command: rosetta run finalization - name: Finalization - no_output_timeout: 10m - when: always - working_directory: /mnt/ephemeral/workdir aw-e2e_copy_action_test: environment: ASPECT_WORKFLOWS_CIRCLE_PIPELINE_NUMBER: << pipeline.number >> @@ -666,6 +626,46 @@ jobs: name: Delivery no_output_timeout: 180m working_directory: /mnt/ephemeral/workdir + aw-root_workspace_configure: + environment: + ASPECT_WORKFLOWS_CIRCLE_PIPELINE_NUMBER: << pipeline.number >> + ASPECT_WORKFLOWS_CIRCLE_PIPELINE_PROJECT_TYPE: << pipeline.project.type >> + ASPECT_WORKFLOWS_CIRCLE_WORKFLOW_BASE_NAME: aspect-workflows + ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml + ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >> + XDG_CACHE_HOME: /mnt/ephemeral/caches + machine: true + parameters: + delivery_manifest: + default: true + type: boolean + workspace: + type: string + resource_class: aspect-build/bazel-lib-small + steps: + - run: + command: /etc/aspect/workflows/bin/configure_workflows_env + name: Workflows environment + - checkout + - run: + command: rm -rf /workflows/artifacts /workflows/testlogs + name: Prepare archive directories + - run: + command: /etc/aspect/workflows/bin/agent_health_check + name: Agent health check + no_output_timeout: 180m + - run: + command: rosetta run configure --workspace << parameters.workspace >> + name: Configure + no_output_timeout: 180m + - store_artifacts: + path: /workflows/artifacts + - run: + command: rosetta run finalization + name: Finalization + no_output_timeout: 10m + when: always + working_directory: /mnt/ephemeral/workdir aw-root_workspace_test: environment: ASPECT_WORKFLOWS_CIRCLE_PIPELINE_NUMBER: << pipeline.number >>