Skip to content

Commit

Permalink
Merge pull request #7648 from habitat-sh/cm/post-refresh-cleanup
Browse files Browse the repository at this point in the history
Post-refresh cleanup
  • Loading branch information
christophermaier authored Apr 29, 2020
2 parents 4bf0e11 + f5922d9 commit 2fabb0d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 243 deletions.
15 changes: 2 additions & 13 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ steps:
limit: 1

- label: "[build] :linux: backline"
skip: "Don't build in verify pipeline until after May 2020 release"
env:
HAB_LICENSE: "accept-no-persist"
command:
Expand Down Expand Up @@ -616,6 +617,7 @@ steps:
limit: 1

- label: "[build] :linux: pkg-cfize"
skip: "Don't build in verify pipeline until after May 2020 release"
env:
HAB_LICENSE: "accept-no-persist"
command:
Expand All @@ -628,19 +630,6 @@ steps:
automatic:
limit: 1

- label: "[build] :linux: pkg-dockerize"
env:
HAB_LICENSE: "accept-no-persist"
command:
- .expeditor/scripts/verify/build_package.sh components/pkg-dockerize
expeditor:
executor:
linux:
privileged: true
retry:
automatic:
limit: 1

- label: "[build] :linux: pkg-export-docker"
env:
HAB_LICENSE: "accept-no-persist"
Expand Down
7 changes: 0 additions & 7 deletions components/pkg-cfize/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ pkg_upstream_url="https://github.com/habitat-sh/habitat"
# explicitly call it here, so it's a dependency. Docker doesn't have
# any dependencies, so we can unpin here without worrying about
# getting dependency conflicts.
#
# We're pinning the other dependencies to their pre base-plans refresh
# versions for the time being for explicitness, due to a bug in how
# `hab pkg install` works in the context of our release pipeline.
#
# It's a bit of a moot point, though, since Docker's not going to run
# on older kernels anyway.
pkg_deps=(core/coreutils
core/findutils
core/grep
Expand Down
21 changes: 0 additions & 21 deletions components/pkg-dockerize/README.md

This file was deleted.

167 changes: 0 additions & 167 deletions components/pkg-dockerize/bin/hab-pkg-dockerize.sh

This file was deleted.

35 changes: 0 additions & 35 deletions components/pkg-dockerize/habitat/plan.sh

This file was deleted.

0 comments on commit 2fabb0d

Please sign in to comment.