summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-07-28 08:49:02 -0700
committerJohn McCrae <john.mccrae@progress.com>2022-08-03 09:06:38 -0700
commit6e061a7fe4a1c4e0290e3ee6c92af9eaf59acb46 (patch)
tree9bfa3cf4bf42686df8e4d70cd6d4700de90c5d2c
parent5407d0c3f4d05554d4f2432c3ce75e790e57a964 (diff)
downloadchef-6e061a7fe4a1c4e0290e3ee6c92af9eaf59acb46.tar.gz
starting to integrate ruby 3.1 into the builds
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--.expeditor/scripts/verify-plan.ps13
-rw-r--r--.expeditor/verify.pipeline.yml2
-rw-r--r--.github/workflows/kitchen.yml1
3 files changed, 5 insertions, 1 deletions
diff --git a/.expeditor/scripts/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1
index 380a0f3ddb..b62800dfe1 100644
--- a/.expeditor/scripts/verify-plan.ps1
+++ b/.expeditor/scripts/verify-plan.ps1
@@ -10,6 +10,9 @@ param(
$env:HAB_ORIGIN = 'ci'
$Plan = 'chef-infra-client'
+Write-Host "--- :mag: :windows: Hab is missing. Where did you go?"
+gci -path c:\ -File hab.exe -Recurse -ErrorAction SilentlyContinue
+
Write-Host "--- :8ball: :windows: Verifying $Plan"
powershell -File "./.expeditor/scripts/ensure-minimum-viable-hab.ps1"
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 7f564e4dcf..08c89d3c49 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -7,7 +7,7 @@ expeditor:
retry:
automatic:
limit: 1
- timeout_in_minutes: 45
+ timeout_in_minutes: 65
steps:
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 26e3dacabe..bedad1755e 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -187,6 +187,7 @@ jobs:
sudo gem install kitchen
sudo gem install berkshelf --no-doc
sudo berks vendor cookbooks
+ sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist
# sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
# sudo /opt/chef/embedded/bin/berks vendor cookbooks
# sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist