summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollin McNeese <cmcneese@chef.io>2021-05-17 12:59:11 -0500
committerCollin McNeese <cmcneese@chef.io>2021-05-17 12:59:11 -0500
commitd23488d17e75c29c45b40451443d28ad86d2c5fa (patch)
tree18ef1cd6260cc9418899776d63d9bb556beaf692
parent6575ca00f73d3f272256a5494d3f92f6c7b9ed43 (diff)
downloadchef-d23488d17e75c29c45b40451443d28ad86d2c5fa.tar.gz
re-enables kernel2 habitat pkg builds
Signed-off-by: Collin McNeese <cmcneese@chef.io>
-rw-r--r--.bldr.toml1
-rw-r--r--.expeditor/habitat-test.pipeline.yml12
-rw-r--r--.expeditor/verify.pipeline.yml11
3 files changed, 24 insertions, 0 deletions
diff --git a/.bldr.toml b/.bldr.toml
index 7c45d57d80..438c546484 100644
--- a/.bldr.toml
+++ b/.bldr.toml
@@ -1,5 +1,6 @@
[chef-infra-client]
build_targets = [
"x86_64-linux",
+ "x86_64-linux-kernel2",
"x86_64-windows"
]
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
index 681b80170c..2861e3616e 100644
--- a/.expeditor/habitat-test.pipeline.yml
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -21,6 +21,18 @@ steps:
privileged: true
single-use: true
+- label: ":linux: Validate Linux (kernel2)"
+ commands:
+ - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux-kernel2
+ - 'echo "--- :hammer_and_wrench: Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2"'
+ - sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2
+ - sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2
+ expeditor:
+ executor:
+ linux:
+ privileged: true
+ single-use: true
+
- label: ":windows: Validate Habitat Builds of Chef Infra"
commands:
- powershell -File ./.expeditor/scripts/ensure-minimum-viable-hab.ps1
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 38c932f195..b1ec9b73f2 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -324,6 +324,17 @@ steps:
privileged: true
single-use: true
+- label: ":habicat: Linux plan (kernel2)"
+ commands:
+ - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux-kernel2'
+ - sudo ./.expeditor/scripts/verify-plan.sh
+ timeout_in_minutes: 60
+ expeditor:
+ executor:
+ linux:
+ privileged: true
+ single-use: true
+
- label: ":habicat: Windows plan"
commands:
- ./.expeditor/scripts/verify-plan.ps1