vagrant-openshift 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7160eb541de9e048c441e7db339f549436354ae3
-  data.tar.gz: bef0f3dbed4812c82833bdafdd6977347b388a03
+  metadata.gz: fb0f56f5dc6e4e37cf5d0a1451d70b2965876e8f
+  data.tar.gz: 1d929e4d3925012e8c74db28229a2a04c024d0f8
 SHA512:
-  metadata.gz: 8bb8f17e5aa85c520fa182855de18d98e2e375443e2856e8f650f23157e6ce155e5450845b101980b2b88f61ce03a9838e871b5e9106189074b25b68b8521853
-  data.tar.gz: 1b213155c7db4fd465b392b8daddcfd52f6efb43b23f3c8bd6a87528ee4069265eea30b122fa2a4165edc04639ebfba3706dfadbff3168d73dbf09ef13d7e91f
+  metadata.gz: eac2e56b2c0ffb2d6e06336da506f72c475b4bce330811a0144071a738b3fd198bac55f8c83fbf9cccb42614cb71f7e9a79fb17c267f4716df7a69fa80cdc039
+  data.tar.gz: 1774e76335dce92535c1d578c9305b8a4b8c8b1e4587df0bc391439a643a616889297834c882a1d8068dc617a4eecfd104392f6e1f9085efd415eaab9d2faa7f

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 2.0.0
+  - 2.1.7
+  - 2.2.3
+
+gemfile: Gemfile
+
+sudo: false

data/README.asciidoc

@@ -1,5 +1,7 @@
 == OpenShift Origin Build Tools
 
+image:https://travis-ci.org/openshift/vagrant-openshift.svg?branch=master[link=https://travis-ci.org/openshift/vagrant-openshift]
+
 This is a link:http://www.vagrantup.com[Vagrant] 1.7.2+ plugin that adds vagrant commands and provisioners to
 build and test link:http://openshift.github.io[OpenShift Origin].
 

data/Rakefile

@@ -24,18 +24,31 @@ namespace :vagrant do
 
   desc "Install plugin into Vagrant"
   task :install do
+
+    syntax_check_cmd = %{
+set -e
+for f in `find lib -name *.rb`
+do
+  ruby -c $f >/dev/null;
+done
+}
+    `#{syntax_check_cmd}`
+    if $?.exitstatus != 0
+      exit 1
+    end
+
     # We want to install our plugin on the system vagrant. Pull gem paths out of
     # $PATH so that we get the correct vagrant binary.
     dirty_path = `echo $PATH`
     clean_path = dirty_path.split(':').select{ |p| not p.include?('gem') }.join(':')
     sys_cmd = `PATH=#{clean_path} which vagrant`.chomp
-    if not $?.exitstatus == 0
+    if $?.exitstatus != 0
       sys_cmd = `which vagrant`.chomp
       if not $?.exitstatus == 0
-        puts "ERROR: Could not find a Vagrant binary in your PATH.\nEnsure that Vagrant has been installed on this system."
-        exit
+        $stderr.puts "ERROR: Could not find a Vagrant binary in your PATH.\nEnsure that Vagrant has been installed on this system."
+        exit 1
       else
-        puts "WARNING: Could not find a Vagrant binary outside of your gem environments.\nEnsure that the Vagrant package has been installed from the official Vagrant packages and not a gem."
+        $stderr.puts "WARNING: Could not find a Vagrant binary outside of your gem environments.\nEnsure that the Vagrant package has been installed from the official Vagrant packages and not a gem."
       end
     end
 
@@ -45,7 +58,10 @@ namespace :vagrant do
     name = Bundler::GemHelper.instance.send(:name)
     version = Bundler::GemHelper.instance.send(:version).to_s
 
-    system "#{sys_cmd} plugin uninstall vagrant-openshift; #{sys_cmd} plugin install pkg/#{name}-#{version}.gem"
+    install_cmd = %{
+#{sys_cmd} plugin install pkg/#{name}-#{version}.gem
+}
+    system(install_cmd)
   end
 end
 

data/lib/vagrant-openshift.rb

@@ -31,4 +31,4 @@ module Vagrant
   end
 end
 
-require "vagrant-openshift/plugin"
+require "vagrant-openshift/plugin"

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

@@ -27,7 +27,7 @@ module Vagrant
         def call(env)
           ssh_user = env[:machine].ssh_info[:username]
           sudo(env[:machine], %{
-set -x
+set -ex
 
 #systemctl enable firewalld
 #systemctl start firewalld
@@ -40,7 +40,7 @@ set -x
 ORIGIN_PATH=/data/src/github.com/openshift/origin
 cat > /etc/profile.d/openshift.sh <<DELIM
 export GOPATH=/data
-export PATH=$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/local/go/bin/:$GOPATH/bin:$PATH
+export PATH=$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/local/bin/linux/amd64:$GOPATH/bin:$PATH
 export KUBECONFIG=/openshift.local.config/master/admin.kubeconfig
 DELIM
 
@@ -99,7 +99,7 @@ chmod +x /usr/bin/generate_openshift_service
 #systemctl enable openshift.service
 
 chown -R #{ssh_user}:#{ssh_user} /data
-          })
+          }, :verbose => false)
 
           @app.call(env)
         end

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

@@ -27,8 +27,8 @@ module Vagrant
         end
 
         def call(env)
-          ssh_user = env[:machine].ssh_info[:username]
           cmd = %{
+set -ex
 
 ORIGIN_PATH=/data/src/github.com/openshift/origin
 ASSET_BACKUP_DIR=/data/asset_dependencies
@@ -65,7 +65,7 @@ popd
 }
           end
 
-          do_execute(env[:machine], cmd, {:timeout=>60*20})
+          do_execute(env[:machine], cmd, :verbose => false, :timeout=>60*20)
           @app.call(env)
         end
       end

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

@@ -35,15 +35,16 @@ if ! [[ -L /etc/udev/rules.d/80-net-setup-link.rules ]]; then
   ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
   rm -f /etc/sysconfig/network-scripts/ifcfg-enp0s3
 fi
-            })
+            }, :verbose => false)
           end
 
           ssh_user = env[:machine].ssh_info[:username]
-          sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 ntp screen java-1.?.0-openjdk bind-utils socat unzip Xvfb ethtool openldap-clients jq", {:timeout=>60*20})
-          sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*10})
+          sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 ntp screen java-1.?.0-openjdk bind-utils socat unzip Xvfb ethtool openldap-clients jq", :timeout=>60*20, :verbose => false)
+          sudo(env[:machine], "yum install -y facter", fail_on_error: false, :timeout=>60*10, :verbose => false)
 
           # Install Chrome and chromedriver for headless UI testing
           sudo(env[:machine], %{
+set -ex
 cd /tmp
 
 # Add signing key for Chrome repo
@@ -62,20 +63,21 @@ unzip chromedriver_linux64.zip
 mv chromedriver /usr/bin/chromedriver
 chown root /usr/bin/chromedriver
 chmod 755 /usr/bin/chromedriver
-          }, {:timeout=>60*10})
+          }, :timeout=>60*10, :verbose => false)
 
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
           #        installed. See BZ#1101508
           #
-          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src", {:timeout=>60*10})
+          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src", :timeout=>60*10, :verbose => false)
           #
           sudo(env[:machine], %{
-
 set -ex
-# TODO Remove me ASAP
-sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
-setenforce 0
+if ! test -e /etc/fedora-release; then
+  # TODO Remove me ASAP
+  sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
+  setenforce 0
+fi
 
 systemctl enable ntpd
 
@@ -84,7 +86,6 @@ usermod -a -G docker #{ssh_user}
 
 sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.0.0/16 \\1'," /etc/sysconfig/docker
 sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=172.30.0.0/16 -\\1'," /etc/sysconfig/docker
-
 sed -i "s,^ADD_REGISTRY='\\(.*\\)',#ADD_REGISTRY='--add-registry=docker.io \\1'," /etc/sysconfig/docker
 
 cat /etc/sysconfig/docker
@@ -127,7 +128,7 @@ systemctl daemon-reexec
 systemctl daemon-reload
 systemctl enable docker
 time systemctl start docker
-          }, {:timeout=>60*30})
+          }, :timeout=>60*30, :verbose => false)
           @app.call(env)
         end
       end

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

@@ -48,9 +48,9 @@ popd >/dev/null
         }
           exit_code = 0
           if as_root
-            _,_,exit_code = sudo(env[:machine], cmd, {:timeout => 60*60*2, :fail_on_error => false, :verbose => false})
+            _,_,exit_code = sudo(env[:machine], cmd, {:timeout => 60*60*4, :fail_on_error => false, :verbose => false})
           else
-            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60*2, :fail_on_error => false, :verbose => false})
+            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60*4, :fail_on_error => false, :verbose => false})
           end
           exit_code
         end
@@ -98,9 +98,8 @@ popd >/dev/null
           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})
             cmds = parse_extended(@options[:extended_test_packages])
+            cmds = cmds.map{ |s| 'TEST_REPORT_DIR=/tmp/openshift-extended-tests/junit/extended ' + s }
             env[:test_exit_code] = run_tests(env, cmds, true)
           end
 

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

@@ -33,7 +33,7 @@ module Vagrant
           remote_write(env[:machine], "/etc/hostname") {
             hostname
           }
-          sudo(env[:machine],"restorecon -v /etc/sysconfig/network /etc/hostname")
+          sudo(env[:machine],"restorecon -v /etc/sysconfig/network /etc/hostname", :verbose => false)
 
           @app.call(env)
         end

data/lib/vagrant-openshift/helper/command_helper.rb

@@ -21,13 +21,34 @@ module Vagrant
     module CommandHelper
 
       def sudo(machine, command, options={})
+        options[:sudo] = true
+        do_execute(machine, command, options)
+      end
+
+      def do_execute(machine, command, options={})
         stdout = []
         stderr = []
         rc = -1
-        options[:timeout] = 60*10 unless options.has_key? :timeout
-        options[:verbose] = true unless options.has_key? :verbose
-        options[:retries] = 0 unless options.has_key? :retries
-        options[:fail_on_error] = true unless options.has_key? :fail_on_error
+
+        options = {
+          timeout: 60*60*4,
+          verbose: true,
+          retries: 0,
+          fail_on_error: true
+        }.merge(options || {})
+
+        execute = lambda { |type, data|
+          if [:stderr, :stdout].include?(type)
+            if type == :stdout
+              color = :green
+              stdout << data
+            else
+              color = :red
+              stderr << data
+            end
+            machine.env.ui.info(data, :color => color, :new_line => false, :prefix => false) unless options[:buffered_output] == true
+          end
+        }
 
         (0..options[:retries]).each do |retry_count|
           begin
@@ -37,17 +58,10 @@ module Vagrant
               machine.env.ui.info "Retrying. Attempt ##{retry_count} with timeout #{options[:timeout]}"
             end
             Timeout::timeout(options[:timeout]) do
-              rc = machine.communicate.sudo(command) do |type, data|
-                if [:stderr, :stdout].include?(type)
-                  if type == :stdout
-                    color = :green
-                    stdout << data
-                  else
-                    color = :red
-                    stderr << data
-                  end
-                  machine.env.ui.info(data, :color => color, :new_line => false, :prefix => false) unless options[:buffered_output] == true
-                end
+              if options[:sudo]
+                rc = machine.communicate.sudo(command, nil, &execute)
+              else 
+                rc = machine.communicate.execute(command, nil, &execute)
               end
             end
           rescue Timeout::Error
@@ -58,34 +72,9 @@ module Vagrant
             machine.env.ui.warn e.message
             rc ||= -1
           end
-
           break if rc == 0
         end
         exit rc if options[:fail_on_error] && rc != 0
-
-        [stdout, stderr, rc]
-      end
-
-      def do_execute(machine, command, options={})
-        stdout = []
-        stderr = []
-        rc = -1
-        options[:verbose] = true unless options.has_key? :verbose
-
-        machine.env.ui.info "Running command '#{command}'" if options[:verbose]
-        rc = machine.communicate.execute(command) do |type, data|
-          if [:stderr, :stdout].include?(type)
-            if type == :stdout
-              color = :green
-              stdout << data
-            else
-              color = :red
-              stderr << data
-            end
-            machine.env.ui.info(data, :color => color, :new_line => false, :prefix => false)
-          end
-        end
-
         [stdout, stderr, rc]
       end
 

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.asciidoc