chore: upgrade to Aspect Workflows 5.10.9 (#881)

.aspect/workflows/deps.bzl

@@ -4,12 +4,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", _http_archive = "http_archi
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 # TODO: move this to a rule set so repositories on Aspect Workflows can avoid this boilerplate
-rosetta_version = "5.10.6"
+rosetta_version = "5.10.9"
 rosetta_integrity = {
-    "darwin_aarch64": "sha256-flgaK95KA2aTKjFlNRZUWwAxlkQJe6Ih69p1owuJVdI=",
+    "darwin_aarch64": "sha256-AmLzGPqB0wVke5SbDwPPp+ABgJghyHOGXccfdx5566s=",
-    "darwin_x86_64": "sha256-TOBC+/nlrPeLpniyvC7Rt2xBffde64Lgz/dKBK6iqXk=",
+    "darwin_x86_64": "sha256-LAwS79N5zn41N4VENKSyo+JS+rnCg0gPhwNsVGIRvCk=",
-    "linux_aarch64": "sha256-NPPHjOViwRoQXEAcMtCAmKfK2OIa408X2+7AuxqkXjE=",
+    "linux_aarch64": "sha256-AwYttfUWTyT9Py76Bvf+wVkKqJCSQPwHPkg9nmRACIs=",
-    "linux_x86_64": "sha256-2rrHoJ72ngfCZRux6GF3RN3ibFhRcb1HZ3LvNFUH3RM=",
+    "linux_x86_64": "sha256-0oDoF+1/j5UvVdTD9bIXBv/5agxiUsAzyhLWxb4puQw=",
 }
 
 # https://github.com/suzuki-shunsuke/circleci-config-merge/releases

.circleci/config.yml

@@ -133,6 +133,9 @@ workflows:
 jobs:
   aw-auto-deliver:
     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 >>
       DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
@@ -145,53 +148,31 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: git fetch
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Git fetch
     - when:
         condition: << pipeline.parameters.delivery_commit >>
         steps:
         - run:
             command: git checkout << pipeline.parameters.delivery_commit >>
-            environment:
-              ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-              ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-              DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Checkout release commit
     - run:
         command: rosetta run delivery
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Delivery
         no_output_timeout: 180m
     working_directory: /mnt/ephemeral/workdir
   aw-buildifier:
     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
@@ -206,64 +187,32 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run buildifier --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Buildifier
         no_output_timeout: 180m
     - store_artifacts:
         path: /workflows/artifacts
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         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
@@ -278,64 +227,32 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run configure --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Configure
         no_output_timeout: 180m
     - store_artifacts:
         path: /workflows/artifacts
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         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 >>
+      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
@@ -350,45 +267,17 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run test --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Test
         no_output_timeout: 180m
     - store_test_results:
@@ -405,13 +294,6 @@ jobs:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
               >> --data TARGETS_SOURCE=test
-            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
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Delivery manifest
             no_output_timeout: 180m
     - store_artifacts:
@@ -419,22 +301,18 @@ jobs:
     - store_artifacts:
         path: /workflows/artifacts
     - store_artifacts:
-        path: vmstat.out
+        path: e2e/copy_action/vmstat.out
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-e2e_copy_to_directory_test:
     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
@@ -449,45 +327,17 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run test --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Test
         no_output_timeout: 180m
     - store_test_results:
@@ -504,13 +354,6 @@ jobs:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
               >> --data TARGETS_SOURCE=test
-            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
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Delivery manifest
             no_output_timeout: 180m
     - store_artifacts:
@@ -518,22 +361,18 @@ jobs:
     - store_artifacts:
         path: /workflows/artifacts
     - store_artifacts:
-        path: vmstat.out
+        path: e2e/copy_to_directory/vmstat.out
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-e2e_coreutils_test:
     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
@@ -548,45 +387,17 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run test --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Test
         no_output_timeout: 180m
     - store_test_results:
@@ -603,13 +414,6 @@ jobs:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
               >> --data TARGETS_SOURCE=test
-            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
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Delivery manifest
             no_output_timeout: 180m
     - store_artifacts:
@@ -617,22 +421,18 @@ jobs:
     - store_artifacts:
         path: /workflows/artifacts
     - store_artifacts:
-        path: vmstat.out
+        path: e2e/coreutils/vmstat.out
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-e2e_external_copy_to_directory_test:
     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
@@ -647,45 +447,17 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run test --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Test
         no_output_timeout: 180m
     - store_test_results:
@@ -702,13 +474,6 @@ jobs:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
               >> --data TARGETS_SOURCE=test
-            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
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Delivery manifest
             no_output_timeout: 180m
     - store_artifacts:
@@ -716,22 +481,18 @@ jobs:
     - store_artifacts:
         path: /workflows/artifacts
     - store_artifacts:
-        path: vmstat.out
+        path: e2e/external_copy_to_directory/vmstat.out
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-e2e_smoke_test:
     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
@@ -746,45 +507,17 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run test --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Test
         no_output_timeout: 180m
     - store_test_results:
@@ -801,13 +534,6 @@ jobs:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
               >> --data TARGETS_SOURCE=test
-            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
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Delivery manifest
             no_output_timeout: 180m
     - store_artifacts:
@@ -815,22 +541,18 @@ jobs:
     - store_artifacts:
         path: /workflows/artifacts
     - store_artifacts:
-        path: vmstat.out
+        path: e2e/smoke/vmstat.out
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-format:
     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
@@ -845,64 +567,32 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run format --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Format
         no_output_timeout: 180m
     - store_artifacts:
         path: /workflows/artifacts
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-gazelle:
     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
@@ -917,64 +607,32 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run gazelle --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Gazelle
         no_output_timeout: 180m
     - store_artifacts:
         path: /workflows/artifacts
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-manual-deliver:
     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 >>
       DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
@@ -988,53 +646,31 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: git fetch
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Git fetch
     - when:
         condition: << pipeline.parameters.delivery_commit >>
         steps:
         - run:
             command: git checkout << pipeline.parameters.delivery_commit >>
-            environment:
-              ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-              ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-              DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Checkout release commit
     - run:
         command: rosetta run delivery
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          ASPECT_WORKFLOWS_WORKSPACE: << parameters.workspace >>
-          DELIVERY_COMMIT: << pipeline.parameters.delivery_commit >>
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Delivery
         no_output_timeout: 180m
     working_directory: /mnt/ephemeral/workdir
   aw-root_workspace_test:
     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
@@ -1049,45 +685,17 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: rm -rf /workflows/artifacts /workflows/testlogs
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Prepare archive directories
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run test --workspace << parameters.workspace >>
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Test
         no_output_timeout: 180m
     - store_test_results:
@@ -1104,13 +712,6 @@ jobs:
         - run:
             command: rosetta run delivery_manifest --workspace << parameters.workspace
               >> --data TARGETS_SOURCE=test
-            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
-              XDG_CACHE_HOME: /mnt/ephemeral/caches
             name: Delivery manifest
             no_output_timeout: 180m
     - store_artifacts:
@@ -1121,19 +722,15 @@ jobs:
         path: vmstat.out
     - run:
         command: rosetta run finalization
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Finalization
         no_output_timeout: 10m
         when: always
     working_directory: /mnt/ephemeral/workdir
   aw-warming:
     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
       XDG_CACHE_HOME: /mnt/ephemeral/caches
     machine: true
@@ -1141,89 +738,38 @@ jobs:
     steps:
     - run:
         command: /etc/aspect/workflows/bin/configure_workflows_env
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Workflows environment
     - checkout
     - run:
         command: /etc/aspect/workflows/bin/agent_health_check
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Agent health check
         no_output_timeout: 180m
     - run:
         command: rosetta run warming --workspace e2e/smoke
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Create warming archive for e2e/smoke
         no_output_timeout: 180m
     - run:
         command: rosetta run warming --workspace e2e/external_copy_to_directory
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Create warming archive for e2e/external_copy_to_directory
         no_output_timeout: 180m
     - run:
         command: rosetta run warming --workspace e2e/coreutils
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Create warming archive for e2e/coreutils
         no_output_timeout: 180m
     - run:
         command: rosetta run warming --workspace e2e/copy_to_directory
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Create warming archive for e2e/copy_to_directory
         no_output_timeout: 180m
     - run:
         command: rosetta run warming --workspace e2e/copy_action
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Create warming archive for e2e/copy_action
         no_output_timeout: 180m
     - run:
         command: rosetta run warming --workspace .
-        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
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Create warming archive for root
         no_output_timeout: 180m
     - run:
         command: /etc/aspect/workflows/bin/warming_archive
-        environment:
-          ASPECT_WORKFLOWS_CONFIG: .aspect/workflows/config.yaml
-          XDG_CACHE_HOME: /mnt/ephemeral/caches
         name: Archive warming tars
     working_directory: /mnt/ephemeral/workdir
   user-job:

lib/tests/tar/BUILD.bazel

@@ -336,8 +336,8 @@ assert_tar_listing(
 mtree_mutate(
     name = "modified1",
     mtree = "source-casync.mtree",
-    strip_prefix = "xattr",
     package_dir = "test",
+    strip_prefix = "xattr",
 )
 
 diff_test(