Remove Obsolete / Dead Code

.bldr.toml

@@ -1,8 +1,6 @@
 [builder-api-proxy]
 plan_path = "components/builder-api-proxy/habitat"
-paths = [
-  "components/builder-web/*",
-]
+paths = ["components/builder-web/*"]
 
 [builder-api]
 plan_path = "components/builder-api/habitat"
@@ -20,38 +18,10 @@ paths = [
 [builder-datastore]
 plan_path = "components/builder-datastore"
 
-[builder-jobsrv]
-plan_path = "components/builder-jobsrv/habitat"
-paths = [
-  "components/builder-jobsrv/*",
-  "components/builder-core/*",
-  "components/builder-protocol/*",
-  "components/builder-db/*",
-  "support/ci/builder-base-plan.sh",
-]
-
-[builder-worker]
-plan_path = "components/builder-worker/habitat"
-paths = [
-  "components/builder-worker/*",
-  "components/builder-core/*",
-  "components/builder-protocol/*",
-  "support/ci/builder-base-plan.sh",
-]
-build_targets = [
-  "x86_64-windows",
-  "x86_64-linux",
-  "x86_64-linux-kernel2"
-]
-
 [builder-minio]
 plan_path = "components/builder-minio/habitat"
-paths = [
-  "components/builder-minio/*"
-]
+paths = ["components/builder-minio/*"]
 
 [builder-memcached]
 plan_path = "components/builder-memcached"
-paths = [
-  "components/builder-memcached/*"
-]
+paths = ["components/builder-memcached/*"]

.envrc

@@ -1,35 +1,41 @@
+#!/bin/bash
+
 export HAB_DOCKER_OPTS="-p 80:80 -p 9636:9636 -p 9631:9631 -p 9638:9638 -p 5432:5432"
 export HAB_STUDIO_SUP="--auto-update"
 export HAB_ORIGIN_KEYS
 export HAB_ORIGIN="habitat"
+
 if [ -d ~/.hab ]; then
   HAB_CONFIG=~/.hab/etc/cli.toml
   if [ -e "$HAB_CONFIG" ]; then
-    export HAB_AUTH_TOKEN=$(cat $HAB_CONFIG | grep "auth_token" | awk '{print $3}' | tr -d '"')
-    export HAB_ORIGIN=$(cat $HAB_CONFIG | grep "origin" | awk '{print $3}' | tr -d '"')
+    HAB_AUTH_TOKEN=$(cat $HAB_CONFIG | grep "auth_token" | awk '{print $3}' | tr -d '"')
+    HAB_ORIGIN=$(cat $HAB_CONFIG | grep "origin" | awk '{print $3}' | tr -d '"')
+    export HAB_AUTH_TOKEN HAB_ORIGIN
   fi
-  if ls ~/.hab/cache/keys/*.sig.key 1> /dev/null 2>&1; then
+  if ls ~/.hab/cache/keys/*.sig.key 1>/dev/null 2>&1; then
     HAB_ORIGIN_KEY_NAMES=$(find ~/.hab/cache/keys/*.sig.key -type f -exec basename {} \;)
     for key in $HAB_ORIGIN_KEY_NAMES; do
       HAB_ORIGIN_KEYS="$HAB_ORIGIN_KEYS ${key%-*}"
     done
-    HAB_ORIGIN_KEYS=$(echo $HAB_ORIGIN_KEYS | tr ' ', ',')
+    HAB_ORIGIN_KEYS=$(echo "$HAB_ORIGIN_KEYS" | tr ' ', ',')
   fi
 else
   HAB_CONFIG=/hab/etc/cli.toml
   if [ -e "$HAB_CONFIG" ]; then
-    export HAB_AUTH_TOKEN=$(cat $HAB_CONFIG | grep "auth_token" | awk '{print $3}' | tr -d '"')
-    export HAB_ORIGIN=$(cat $HAB_CONFIG | grep "origin" | awk '{print $3}' | tr -d '"')
+    HAB_AUTH_TOKEN=$(cat $HAB_CONFIG | grep "auth_token" | awk '{print $3}' | tr -d '"')
+    HAB_ORIGIN=$(cat $HAB_CONFIG | grep "origin" | awk '{print $3}' | tr -d '"')
+    export HAB_AUTH_TOKEN HAB_ORIGIN
   fi
-  if ls /hab/cache/keys/*.sig.key 1> /dev/null 2>&1; then
+  if ls /hab/cache/keys/*.sig.key 1>/dev/null 2>&1; then
     HAB_ORIGIN_KEY_NAMES=$(find /hab/cache/keys/*.sig.key -type f -exec basename {} \;)
     for key in $HAB_ORIGIN_KEY_NAMES; do
       HAB_ORIGIN_KEYS="$HAB_ORIGIN_KEYS ${key%-*}"
     done
-    HAB_ORIGIN_KEYS=$(echo $HAB_ORIGIN_KEYS | tr ' ', ',')
+    HAB_ORIGIN_KEYS=$(echo "$HAB_ORIGIN_KEYS" | tr ' ', ',')
   fi
 fi
-if [ -n $HAB_ORIGIN ]; then
+
+if [ -n "$HAB_ORIGIN" ]; then
   HAB_ORIGIN_KEYS="${HAB_ORIGIN_KEYS},${HAB_ORIGIN}"
 fi
 

.expeditor/config.yml

@@ -21,8 +21,6 @@ pipelines:
       public: true
   - release_builder:
       description: Builder release process
-  - post_habitat_release:
-      description: "Tasks to be performed after a successful Habitat release"
 
 staging_areas:
   - release_staging:

.expeditor/scripts/generate_bootstrap_bundle.sh

@@ -129,15 +129,6 @@ hab pkg download \
 # `core-hab-launcher-${VERSION}-${RELEASE}-x86_64-linux.hart`, etc.
 hab_hart () {
     local pkg_target=${1:-x86_64-linux}
-    # Until habitat/builder-worker is part of our release pipeline,
-    # it's likely that we will end up with more than one `core/hab`
-    # artifact: one from the release, and the previous one, brought in
-    # by habitat/builder-worker (because, until that's automated, it
-    # won't have been updated to depend on the new one yet!)
-    #
-    # Once this is no longer the case, you can remove the warning
-    # comment at the declaration of `${this_bootstrap_bundle}`.
-    #
     # The `sort` invocation will sort the output of `find` by the
     # release timestamp, and then take the most recent one (i.e., the
     # last)