summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher A. Snapp <csnapp@chef.io>2019-10-14 14:04:02 -0600
committerChristopher A. Snapp <csnapp@chef.io>2019-10-14 14:31:04 -0600
commiteedba104312306f4f56d2ab81781b82dde01c2bd (patch)
tree1c14f64b11da5818fd258f3d6efa6ca55f35428a
parent891eb6655e61ea9b4b40669a60ca508e3163437e (diff)
downloadchef-eedba104312306f4f56d2ab81781b82dde01c2bd.tar.gz
Fix habitat build in expeditor config
Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
-rw-r--r--.bldr.toml5
-rw-r--r--.expeditor/build.habitat.yml2
-rw-r--r--.expeditor/config.yml9
3 files changed, 10 insertions, 6 deletions
diff --git a/.bldr.toml b/.bldr.toml
new file mode 100644
index 0000000000..421037f685
--- /dev/null
+++ b/.bldr.toml
@@ -0,0 +1,5 @@
+[chef-infra-client]
+build_targets = [
+ "x86_64-linux",
+ "x86_64-linux-kernel2"
+]
diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml
new file mode 100644
index 0000000000..4e13b540ec
--- /dev/null
+++ b/.expeditor/build.habitat.yml
@@ -0,0 +1,2 @@
+---
+origin: chef
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index c4c62bf1d2..0b9beaeed6 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -17,13 +17,10 @@ rubygems:
docker_images:
- chef
-habitat_packages:
- - chef-client:
- also_build_for_linux_kernel2: true
-
pipelines:
- verify:
public: true
+ - habitat/build
- omnibus/release
- omnibus/adhoc:
definition: .expeditor/release.omnibus.yml
@@ -65,9 +62,9 @@ merge_actions:
ignore_labels:
- "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- - built_in:trigger_habitat_package_build:
+ - trigger_pipeline:habitat/build:
ignore_labels:
- - "Expeditor: Skip Build"
+ - "Expeditor: Skip Habitat"
- "Expeditor: Skip All"
only_if: built_in:bump_version
- trigger_pipeline:omnibus/release: