kitchen-habitat 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a7186aecdeb7d78328ba237f0f586a5bafcd010
-  data.tar.gz: bcfcea1fe6c318ad4b132f2e34d9fe91503e6752
+  metadata.gz: 24e28546bbe3eb127598d6f93d8c283770a2ceb6
+  data.tar.gz: fb278ba7a725265367e588ff3e522ac17016c3c5
 SHA512:
-  metadata.gz: cb291cfc369592c4fe43377f6c9d2a7bd26a454af682c41406281a38020063cccf9b16a2c9e161e60835ecddb054ec6be6bebf4eeb803863d1c13c49f423969e
-  data.tar.gz: 848a9b1394ceecf32e6f7a51cc5378d91d57c023030508fcc820a88148190960f71f6d6aac7ca9fe1c53bf942479a420b0cd58acad3a0c68ac9e8150878e99cd
+  metadata.gz: 54e12cd0a926b6e7c978134000db2f33f8b5e15284f61fbec38fe6a71d7bc7549a9e5027ae20aba70b450407ef1e0e35a3a25642f2ea4f20cf46ec107c70c88b
+  data.tar.gz: 1cd47e9aee9bdee8179cae232627d3402787a7b2dc29c67692cb9f0358dfd882471bbd35888b33f3c22a47eac040a4b6ecd2c8e95518feeffd521eb48e6fff5d

data/README.md

@@ -15,7 +15,7 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 
 * `depot_url`
   * Target Habitat Depot to use to install packages.
-  * Defaults to `nil` (which will use the default depot settings for the `hab` CLI).
+  * Defaults to `nil` (which will use the default depot settings for the `hab` CLI from ~/.hab/etc/cli.toml).
 
 ### Supervisor Settings
 
@@ -85,7 +85,7 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
   * Directory containing a user.toml or/and a default.toml, hooks, and configuration files to be passed to the service under test.
   * Defaults to `nil`
 * `override_package_config`
-  * Tell the supervisor to the the configuration files and hooks from `config_directory` instead of what was packaged with the service.  (Uses `--config-from` via the `hab-sup` CLI.)
+  * Tell the supervisor to load the the configuration files and hooks from `config_directory` instead of what was packaged with the service.  (Uses `--config-from` via the `hab-sup` CLI.)
 * `user_toml_name`
   * Name of the file to be used as the user.toml for the service under test.
   * Defaults to `user.toml`
@@ -97,6 +97,8 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 
 ## Examples
 
+Run the core-redis package
+
 ```yaml
 driver:
   name: vagrant
@@ -114,3 +116,38 @@ platforms:
 suites:
   - name: default
 ```
+
+Two node: elasticsearch and kibana 
+
+```yaml
+driver:
+  name: docker
+
+provisioner:
+  name: habitat
+  hab_sup_origin: core
+  hab_sup_name: sup
+
+platforms:
+  - name: ubuntu-16.04
+
+suites:
+  - name: elasticsearch
+    provisioner:
+      package_origin: core
+      package_name: elasticsearch
+    driver:
+      instance_name: elastic
+
+  - name: kibana
+    provisioner:
+      package_origin: core
+      package_name: kibana
+      hab_sup_peer:
+        - elastic
+      hab_sup_bind:
+        - elasticsearch:elasticsearch.default
+    driver:
+      instance_name: kibana
+      links: elastic:elastic  
+```

data/lib/kitchen/provisioner/habitat.rb

@@ -39,6 +39,7 @@ module Kitchen
       default_config :package_release, nil
       default_config :service_topology, nil
       default_config :service_update_strategy, nil
+      default_config :channel, "stable"
 
       # local stuffs to copy
       default_config :results_directory, nil
@@ -51,7 +52,7 @@ module Kitchen
 
       def finalize_config!(instance)
         # Check to see if a package ident was specified for package name and be helpful
-        unless  config[:package_name].nil? || (config[:package_name] =~ /\//).nil?
+        unless config[:package_name].nil? || (config[:package_name] =~ /\//).nil?
           config[:package_origin], config[:package_name], config[:package_version], config[:package_release] = config[:package_name].split("/")
         end
 
@@ -151,13 +152,25 @@ module Kitchen
 
       def run_package_in_background
         if config[:use_screen]
-          "sudo screen -mdS \"#{clean_package_name}\" hab-sup start #{package_ident} #{supervisor_options}"
+          "sudo screen -mdS \"#{clean_package_name}\" hab start #{package_ident} #{supervisor_options}"
         else
           <<-RUN
           [ -f ./run.pid ] && rm -f run.pid
           [ -f ./nohup.out ] && rm -f nohup.out
-          nohup sudo hab-sup start #{package_ident} #{supervisor_options} & echo $! > run.pid
-          sleep 5
+          nohup sudo hab sup run & echo $! > run.pid
+
+          until hab svc status
+          do
+            sleep 1
+          done
+
+          sudo hab start #{package_ident} #{supervisor_options}
+          
+          until hab svc status | grep #{package_ident}
+          do
+            sleep 1
+          done
+
           [ -f ./nohup.out ] && cat nohup.out || (echo "Failed to start the supervisor." && exit 1)
           RUN
         end
@@ -304,6 +317,7 @@ module Kitchen
         options += " --group #{config[:hab_sup_group]}" unless config[:hab_sup_group].nil?
         options += " --topology #{config[:service_topology]}" unless config[:service_topology].nil?
         options += " --strategy #{config[:service_update_strategy]}" unless config[:service_update_strategy].nil?
+        options += " --channel #{config[:channel]}" unless config[:channel].nil?
 
         options
       end

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.6.1".freeze
+    VERSION = "0.7.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Habitat provisioner for test-kitchen