vanagon 0.15.23 → 0.15.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7bf8cec1d39b4fe95d0d109181be2d573f5be24eb8e1241936b5b9035022ebbd
-  data.tar.gz: bc390abf3fe18a06fb82d7ed4936f54ca4f64840bb1b4374ec7f4a5d0c3119f7
+SHA1:
+  metadata.gz: 4c90f6996d87caf5793fc3eaf0b7b609454d041b
+  data.tar.gz: 6c9d867da407534d7c7572c0ae5b309b9cd4f63c
 SHA512:
-  metadata.gz: afd0ca4f73413d2f228e520f1456aa4f8c59cd9c28cd36522fc43a74d8b38d0e43b3a032de8703f3d821d469d02d12d9e9cf03c2456920bf820bfe218d86955a
-  data.tar.gz: '08197372b61873aacff50c307f23fa80e7b566e6ad2c45bd98b7d662d101650f79594227438cd192febe4037d8746b44b472810663e3d13e80c6cfab2036b8cc'
+  metadata.gz: 59cbc9de7d13484bd6ee0e6c4909740d8666e32d2f79f40439c27cf76dfb206e08dcb424faa0acea098fdfe7314b5341afe470e70ba0a4521daaeccd5e853015
+  data.tar.gz: c86a251a3092cf00a30d46ff244999cae5501b95549c9a3b1544eb5032e0aea87d3e8bdfc21b8d54a8c8f50bcf1881e2eb38d6054f13bfdf1fa674a5f001808f

data/lib/vanagon/component/dsl.rb

@@ -186,6 +186,8 @@ class Vanagon
           target_mode = '0644'
           default_mode = '0644'
         when "smf"
+          # modify version in smf manifest so service gets restarted after package upgrade
+          @component.install << %{#{@component.platform.sed} -ri 's/(<service.*version=)(".*")/\\1"#{Time.now.to_i}"/' #{service_file}}
           target_service_file = File.join(@component.platform.servicedir, service_type.to_s, "#{service_name}.xml")
           target_default_file = File.join(@component.platform.defaultdir, service_name)
           target_mode = '0644'

data/lib/vanagon/engine/docker.rb

@@ -33,15 +33,22 @@ class Vanagon
       # This method is used to obtain a vm to build upon using
       # a docker container.
       # @raise [Vanagon::Error] if a target cannot be obtained
-      def select_target
+      def select_target # rubocop:disable Metrics/AbcSize
         extra_args = @platform.docker_run_args.nil? ? [] : @platform.docker_run_args
 
         Vanagon::Utilities.ex("#{@docker_cmd} run -d --name #{build_host_name}-builder -p #{@platform.ssh_port}:22 #{extra_args.join(' ')} #{@platform.docker_image}")
         @target = 'localhost'
 
-        # Wait for ssh to come up in the container
-        Vanagon::Utilities.retry_with_timeout do
-          Vanagon::Utilities.remote_ssh_command("#{@target_user}@#{@target}", 'exit', @platform.ssh_port)
+        # Wait for ssh to come up in the container. Retry 5 times with a 1
+        # second sleep between errors to account for network resets while SSHD
+        # is starting. Allow a maximum of 5 seconds for SSHD to start.
+        Vanagon::Utilities.retry_with_timeout(5, 5) do
+          begin
+            Vanagon::Utilities.remote_ssh_command("#{@target_user}@#{@target}", 'exit', @platform.ssh_port)
+          rescue StandardError => e
+            sleep(1) # Give SSHD some time to start.
+            raise e
+          end
         end
       rescue StandardError => e
         raise Vanagon::Error.wrap(e, "Something went wrong getting a target vm to build on using docker. Ssh was not up in the container after 5 seconds.")

data/lib/vanagon/platform/solaris_11.rb

@@ -116,6 +116,7 @@ class Vanagon
         @make = "/usr/bin/gmake"
         @tar = "/usr/bin/gtar"
         @patch = "/usr/bin/gpatch"
+        @sed = "/usr/gnu/bin/sed"
         @num_cores = "/usr/bin/kstat cpu_info | /usr/bin/ggrep -E '[[:space:]]+core_id[[:space:]]' | wc -l"
         super(name)
         if @architecture == "sparc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.23
+  version: 0.15.24
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.