restore staging area to expeditor

Signed-off-by: Matt Wrock <[email protected]>

.expeditor/config.yml

@@ -36,6 +36,10 @@ release_branches:
   - v1.6:
       version_constraint: 1.*
 
+staging_areas:
+  - release_staging:
+      workload: pull_request_merged:{{github_repo}}:{{release_branch}}:*
+
 subscriptions:
   - workload: pull_request_opened:{{github_repo}}:{{release_branch}}:*
     actions:
@@ -46,7 +50,7 @@ subscriptions:
           only_if_team_member:
             - habitat-sh/habitat-core-maintainers
 
-  - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:*
+  - workload: staged_workload_released:{{agent_id}}:release_staging:*
     actions:
       - built_in:bump_version
       - built_in:update_changelog
@@ -59,19 +63,25 @@ subscriptions:
   - workload: buildkite_build_passed:{{agent_id}}:release_habitat:*
     actions:
       - trigger_pipeline:end_to_end
+      - unlock_staging_area:release_staging:
+          always_run: true
       - bash:.expeditor/scripts/release_habitat/expeditor_destroy_build_channel.sh:
           always_run: true
           post_commit: true
 
   # Make sure we unlock to allow later builds if one fails.
   - workload: buildkite_build_failed:{{agent_id}}:release_habitat:*
     actions:
+      - unlock_staging_area:release_staging:
+          always_run: true
       - bash:.expeditor/scripts/release_habitat/expeditor_destroy_build_channel.sh:
           always_run: true
           post_commit: true
 
   - workload: buildkite_build_canceled:{{agent_id}}:release_habitat:*
     actions:
+      - unlock_staging_area:release_staging:
+          always_run: true
       - bash:.expeditor/scripts/release_habitat/expeditor_destroy_build_channel.sh:
           always_run: true
           post_commit: true