summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2019-04-01 15:08:14 -0500
committerTom Duffield <tom@chef.io>2019-04-01 15:10:12 -0500
commitf1ab7931e628722b00ea71cc8b52750ed8415c36 (patch)
treeea74faae2bc28d4f82b0e4d2cd77946b141ca9ef
parent0b2eeeab6bc5b2ecce586f37d431ba77dbb4b526 (diff)
downloadchef-f1ab7931e628722b00ea71cc8b52750ed8415c36.tar.gz
Move to using the v2 Habitat Build functionalitytduffield/hab-v2
Signed-off-by: Tom Duffield <tom@chef.io>
-rw-r--r--.bldr.toml5
-rw-r--r--.expeditor/build.habitat.yml2
-rw-r--r--.expeditor/config.yml7
3 files changed, 10 insertions, 4 deletions
diff --git a/.bldr.toml b/.bldr.toml
new file mode 100644
index 0000000000..f819d2b445
--- /dev/null
+++ b/.bldr.toml
@@ -0,0 +1,5 @@
+[chef-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 a8c308a29e..a023c554ef 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -22,9 +22,8 @@ rubygems:
docker_images:
- chef
-habitat_packages:
- - chef-client:
- also_build_for_linux_kernel2: true
+pipelines:
+ - habitat/build
github:
# The file where the MAJOR.MINOR.PATCH version is kept. The version in this file
@@ -64,7 +63,7 @@ merge_actions:
ignore_labels:
- "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- - built_in:trigger_habitat_package_build:
+ - trigger_pipeline:habitat/build:
ignore_labels:
- "Expeditor: Skip Habitat"
- "Expeditor: Skip All"