summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGene Wood <gene_wood@cementhorizon.com>2022-11-29 12:41:02 -0800
committerGitHub <noreply@github.com>2022-11-29 15:41:02 -0500
commit3769fa6efe1657c0eb94dbcb9d8dff908cb8e1af (patch)
tree97f7b9b86784488241f00188ab1b439308e32f77
parent883f1101bcabf043375896c5dc77a81b80f9a7fa (diff)
downloadchef-3769fa6efe1657c0eb94dbcb9d8dff908cb8e1af.tar.gz
Update deprecated "hab sup status" call (#13314)
This changes "hab sup status" calls to "hab svc status" calls to avoid this deprecation notice : ``` * ruby_block[wait-for-sup-default-startup] action run 'hab sup status' as an alias for 'hab svc status' is deprecated. Please update your automation and processes accordingly. ``` * Update ruby block names to reference svc instead of sup Signed-off-by: Gene Wood <gene_wood@cementhorizon.com>
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_config.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_service.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_sup.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_user_toml.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_config.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_service.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_sup.rb4
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_user_toml.rb4
8 files changed, 16 insertions, 16 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_config.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_config.rb
index 616fbd702f..db000d9f65 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_config.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_config.rb
@@ -5,9 +5,9 @@ habitat_sup "default" do
license "accept"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_service.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_service.rb
index 294cb982b0..ad1039fd89 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_service.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_service.rb
@@ -5,9 +5,9 @@ habitat_sup "default" do
end
# This pause is in place to make sure the supervisor is up and running before we proceed. The previous resource does the full install and initial startup. That can take a bit longer in the pipeline.
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_sup.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_sup.rb
index c1bf21c2c8..4175cb4672 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_sup.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_sup.rb
@@ -12,9 +12,9 @@ habitat_sup "tester" do
launcher_version "13458"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_user_toml.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_user_toml.rb
index e7947fd4e1..49df835ec7 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_user_toml.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_user_toml.rb
@@ -4,9 +4,9 @@ habitat_sup "default" do
license "accept"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_config.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_config.rb
index c783b4c654..256c84d46a 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_config.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_config.rb
@@ -2,9 +2,9 @@ habitat_sup "default" do
license "accept"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_service.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_service.rb
index a522c64dfa..e65127cefe 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_service.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_service.rb
@@ -3,9 +3,9 @@ habitat_sup "default" do
gateway_auth_token "secret"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_sup.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_sup.rb
index a12825534a..27c5af7643 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_sup.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_sup.rb
@@ -5,9 +5,9 @@ habitat_sup "tester" do
listen_gossip "0.0.0.0:9998"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_user_toml.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_user_toml.rb
index 8a658a6a2a..a668558948 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_user_toml.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_habitat_win_user_toml.rb
@@ -2,9 +2,9 @@ habitat_sup "default" do
license "accept"
end
-ruby_block "wait-for-sup-default-startup" do
+ruby_block "wait-for-svc-default-startup" do
block do
- raise unless system("hab sup status")
+ raise unless system("hab svc status")
end
retries 30
retry_delay 1