vagrant-openshift 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6442fc41de174606c1957a3f25c8f690b07cc17a
-  data.tar.gz: 7d8ba30898811c2427acc815f5359f97567650ad
+  metadata.gz: ad1016fc5cb2140527ddf4ac73c2f635c460c471
+  data.tar.gz: d352b58cf8cc8d2a666a3a8e7bdb732c50f580b5
 SHA512:
-  metadata.gz: 77ecbcf4989e0a37402462adc1c9306923c907da16321cb3f43162b4107be1663be05ddbeb9d2b81c02fefb344f507e9d8a1c45ac2a88dcc82604095816c8452
-  data.tar.gz: 9d977a818c0a67269fe6aaeb3388649998c7cbe68447f6636dde365c8455766635e607d1a125ab913dc09522122eff476a86ca57dedb20b32fad163f4729427b
+  metadata.gz: aa8c92f03ceaddb2418e60692160bab0e5ff81f4fc5c7510c24d058dc1f7d2cb870b1d5b73bcc80bb508750f6f7760d60797a1d50d7715a567a9cd48c8797e0f
+  data.tar.gz: cf02fb45bbf8583a0a377fcd640034e6b8ce18f85c9e959fc98e89d5cd1b7f9f4cbdc225934aae92d2a634f1492ae5a79ab822633a9c8c0954ceac23b539270d

data/lib/vagrant-openshift/action/{install_openshift_images.rb → atomic_host_upgrade.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright 2014 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshiftImages
+      class AtomicHostUpgrade
         include CommandHelper
 
         def initialize(app, env)
@@ -26,25 +26,10 @@ module Vagrant
         end
 
         def call(env)
-          Vagrant::Openshift::Constants.images.each do |image_name, _|
-            puts "Importing #{image_name} from Docker index"
-            sudo(env[:machine], pull_docker_image_cmd(image_name), {
-              :timeout=>60*20
-            })
-          end
-          @app.call(env)
-        end
+          sudo env[:machine], "atomic host upgrade"
 
-        def pull_docker_image_cmd(image_name)
-          %{
-docker pull '#{image_name}'
-if ! docker inspect '#{image_name}' 2>&1 > /dev/null
-then
-  docker pull '#{image_name}'
-fi
-          }
+          @app.call(env)
         end
-
       end
     end
   end

data/lib/vagrant-openshift/action/build_openshift.rb

@@ -29,18 +29,15 @@ module Vagrant
         def call(env)
           if @options[:images]
             cmd = %{
-echo "Performing openshift release build..."
+echo "Performing openshift release build with images..."
 set -e
-hack/verify-gofmt.sh
-hack/build-release.sh
-hack/build-images.sh
+make release
 }
           else
             cmd = %{
-echo "Performing openshift build..."
+echo "Performing openshift release build..."
 set -e
-hack/verify-gofmt.sh
-hack/build-go.sh
+make release-binaries
 }
           end
           cmd += %{

data/lib/vagrant-openshift/action/install_openshift_base_dependencies.rb

@@ -112,9 +112,12 @@ GOPATH=/data go get golang.org/x/tools/cmd/vet
 
 chown -R #{ssh_user}:#{ssh_user} /data
 
+sed -i "s,^#DefaultTimeoutStartSec=.*,DefaultTimeoutStartSec=240s," /etc/systemd/system.conf
+
+systemctl daemon-reexec
 systemctl daemon-reload
 systemctl enable docker
-systemctl start docker
+time systemctl start docker
           }, {:timeout=>60*30})
           @app.call(env)
         end

data/lib/vagrant-openshift/action/run_openshift_tests.rb

@@ -91,13 +91,13 @@ popd >/dev/null
           end
 
           cmd = cmd_env.join(' ') + ' ' + build_targets.join(' ')
-          env[:test_exit_code] = run_tests(env, [cmd], true)
+          env[:test_exit_code] = run_tests(env, [cmd], false)
 
           if env[:test_exit_code] == 0 && @options[:extended_test_packages].length > 0
             # for extended tests we need a ginkgo binary
             do_execute(env[:machine], "go get github.com/onsi/ginkgo/ginkgo", {:timeout => 60*60*2, :fail_on_error => true, :verbose => false})
-            extended_cmd = 'hack/test-extended.sh ' + Shellwords.escape(@options[:extended_test_packages])
-            env[:test_exit_code] = run_tests(env, [extended_cmd], true)
+            cmds = @options[:extended_test_packages].split(",").map{ |p| 'test/extended/'+Shellwords.escape(p)+'.sh'}
+            env[:test_exit_code] = run_tests(env, cmds, true)
           end
 
 

data/lib/vagrant-openshift/action.rb

@@ -21,6 +21,12 @@ module Vagrant
     module Action
       include Vagrant::Action::Builtin
 
+      def self.build_atomic_host(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use AtomicHostUpgrade
+        end
+      end
+
       def self.build_openshift_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CreateYumRepositories
@@ -32,7 +38,7 @@ module Vagrant
 
       def self.install_openshift(options)
         Vagrant::Action::Builder.new.tap do |b|
-          #b.use YumUpdate
+          b.use YumUpdate
           b.use SetHostName
           b.use InstallOpenshift
           b.use InstallOpenshiftRhel7
@@ -228,6 +234,7 @@ module Vagrant
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
       autoload :RunSystemctl, action_root.join("run_systemctl")
+      autoload :AtomicHostUpgrade, action_root.join("atomic_host_upgrade")
     end
   end
 end

data/lib/vagrant-openshift/command/build_atomic_host.rb

@@ -0,0 +1,50 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class BuildAtomicHost < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "Upgrade the atomic host to the latest OStree"
+        end
+
+        def execute
+          options = {}
+          options[:clean] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant build-atomic-host [vm-name]"
+            o.separator ""
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.build_atomic_host(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/plugin.rb

@@ -42,6 +42,11 @@ module Vagrant
         Commands::RepoSyncSti
       end
 
+      command "build-atomic-host" do
+        require_relative "command/build_atomic_host"
+        Commands::BuildAtomicHost
+      end
+
       command "build-openshift-base" do
         require_relative "command/build_openshift_base"
         Commands::BuildOpenshiftBase

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.8"
+    VERSION = "2.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,6 +122,7 @@ files:
 - Rakefile
 - lib/vagrant-openshift.rb
 - lib/vagrant-openshift/action.rb
+- lib/vagrant-openshift/action/atomic_host_upgrade.rb
 - lib/vagrant-openshift/action/build_openshift.rb
 - lib/vagrant-openshift/action/build_openshift_base_images.rb
 - lib/vagrant-openshift/action/build_sti.rb
@@ -138,7 +139,6 @@ files:
 - lib/vagrant-openshift/action/install_openshift.rb
 - lib/vagrant-openshift/action/install_openshift_asset_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift_base_dependencies.rb
-- lib/vagrant-openshift/action/install_openshift_images.rb
 - lib/vagrant-openshift/action/install_openshift_rhel7.rb
 - lib/vagrant-openshift/action/local_openshift_checkout.rb
 - lib/vagrant-openshift/action/modify_ami.rb
@@ -155,6 +155,7 @@ files:
 - lib/vagrant-openshift/action/test_exit_code.rb
 - lib/vagrant-openshift/action/yum_update.rb
 - lib/vagrant-openshift/command/bootstrap_openshift.rb
+- lib/vagrant-openshift/command/build_atomic_host.rb
 - lib/vagrant-openshift/command/build_openshift.rb
 - lib/vagrant-openshift/command/build_openshift_base.rb
 - lib/vagrant-openshift/command/build_openshift_base_images.rb