Merge pull request #1858 from habitat-sh/post_hab_build

remove worker related post habitat build steps and cleanup bootstrap seed list
habitat-sh · Nov 18, 2024 · 62431c5 · 62431c5
2 parents 0ceece7 + 8e108f8
commit 62431c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 101 deletions.
diff --git a/.expeditor/builder_seed.toml b/.expeditor/builder_seed.toml
@@ -8,36 +8,13 @@ packages = [
   "core/hab-launcher",
   "core/hab",
   "core/hab-sup",
+]
 
+[[x86_64-linux]]
+channel = "LTS-2024"
+packages = [
   # Builder services
   "habitat/builder-api",
   "habitat/builder-api-proxy",
-  "habitat/builder-jobsrv",
-  "habitat/builder-worker",
   "habitat/builder-memcached",
-
-  # Utilities
-  "core/nmap"
-]
-
-[[x86_64-linux-kernel2]]
-channel = "stable"
-packages = [
-  # Supervisor and prerequisites
-  "core/hab-launcher",
-  "core/hab",
-  "core/hab-sup",
-
-  "habitat/builder-worker"
-]
-
-[[x86_64-windows]]
-channel = "stable"
-packages = [
-  # Supervisor and prerequisites
-  "core/windows-service",
-  "core/hab",
-  "core/hab-sup",
-
-  "habitat/builder-worker"
 ]
diff --git a/.expeditor/post_habitat_release.pipeline.yml b/.expeditor/post_habitat_release.pipeline.yml
@@ -31,80 +31,6 @@ steps:
             - GITHUB_USER
     soft_fail: true
 
-  # We build new releases of habitat/builder-worker now since they
-  # pull in the new Habitat release we just created (specifically, the
-  # studio and build program).
-  #
-  # We then promote them to the acceptance channel, from which workers
-  # in our acceptance environment will update themselves. Once we try
-  # building some packages in acceptance, we can unblock this pipeline
-  # to have them automatically promoted to the stable channel,
-  # allowing our production workers to then update.
-
-  - label: "[:linux: build habitat/builder-worker]"
-    command:
-      - .expeditor/scripts/post_habitat_release/build_worker.sh
-    expeditor:
-      executor:
-        docker:
-          privileged: true
-          environment:
-            - HAB_ORIGIN
-            - BUILD_PKG_TARGET=x86_64-linux
-
-  - label: "[:linux: :two: build habitat/builder-worker]"
-    command:
-      - .expeditor/scripts/post_habitat_release/build_worker.sh
-    expeditor:
-      executor:
-        docker:
-          privileged: true
-          environment:
-            - HAB_ORIGIN
-            - BUILD_PKG_TARGET=x86_64-linux-kernel2
-
-  - label: "[:windows: build habitat/builder-worker]"
-    command:
-      - powershell .expeditor/scripts/post_habitat_release/build_worker.ps1
-    expeditor:
-      executor:
-        docker:
-          host_os: windows
-          environment:
-            - HAB_ORIGIN
-            - BUILD_PKG_TARGET=x86_64-windows
-            - BUILDKITE_AGENT_ACCESS_TOKEN
-
-  - wait
-
-  - label: "Promote to habitat/builder-worker to acceptance"
-    command:
-      - .expeditor/scripts/post_habitat_release/promote_packages_to_channel.sh acceptance
-    expeditor:
-      executor:
-        docker:
-          privileged: true
-
-  - block: "Evaluate habitat/builder-worker in Acceptance"
-    prompt: |
-      The previous promotion step made these habitat/builder-worker
-      packages available in our Acceptance workers. Please try
-      building packages in acceptance to ensure they behave properly.
-
-      When you are satisfied, please unblock this step to promote the
-      same packages to the stable channel, where they will be consumed
-      by our Production builders.
-
-  - label: "Promote habitat/builder-worker to stable"
-    command:
-      - .expeditor/scripts/post_habitat_release/promote_packages_to_channel.sh stable
-    expeditor:
-      executor:
-        docker:
-          privileged: true
-
-  - wait
-
   # We do this after building and promoting new workers to ensure the
   # bundle contains those workers.
   - label: ":s3: Create new Bootstrap Bundle"