vagrant-openshift 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ee00f5ae807ab4d43099a4149aba767a24af57
-  data.tar.gz: f3d4576d80700025f1cb85ef64abefba02d58670
+  metadata.gz: 75a4e67fcac9744e3730fe8000bbb32e895a0ad1
+  data.tar.gz: 72853ef81bc88d08f18f2a5829d81a21c42ba0aa
 SHA512:
-  metadata.gz: 1441657e3ee502608b67b01e9a5cd6d92cbe97186857edb79f0151f5ab59ee12c616b33939e1764831ab0c62c36fa74cd2633304825a1d8bda63080e501f3d95
-  data.tar.gz: 4fd81093a3134cfb35c5632b8702942bb357edad6efaf076d6686d17c876edffd742ac63054249d57070fd69e6b702cec71409bf2c41cdb3c7fcd9add1d1c132
+  metadata.gz: d14ba4ce9dcc87fdb0d0f8ae293952e96e5d025cd30788e916848107e1de310e12326a828a3e8ecc55516b4c2c0c3a226fb719ef2e44f6624a544262ee47318b
+  data.tar.gz: 2efa25d0faa6896c8d850272e9df17ce2aeb82d7807465f1fcad48e3410ef0866cd2a4e2ed859ef1d6a221769a54e4e7491537ffeed5ca243e1d74a053642537

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

@@ -38,6 +38,7 @@ module Vagrant
             "/var/log/secure"                      => artifacts_dir + "secure",
             "/var/log/audit/audit.log"             => artifacts_dir + "audit.log",
             "/tmp/origin/e2e/"                     => artifacts_dir + "e2e/",
+            "/tmp/openshift-extended-tests/"       => artifacts_dir + "extended-tests/",
             "/tmp/openshift-cmd/"                  => artifacts_dir + "cmd/",
 
             "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",

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

@@ -42,8 +42,31 @@ fi
           # FIXME: Move 'openshift/centos-mongodb' into openshift org and then
           #        add the image into 'repositories' constants
           #
-          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", {:timeout=>60*20})
+          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", {:timeout=>60*20})
           sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*10})
+
+          # Install Chrome and chromedriver for headless UI testing
+          sudo(env[:machine], %{
+cd /tmp
+
+# Add signing key for Chrome repo
+wget https://dl.google.com/linux/linux_signing_key.pub
+rpm --import linux_signing_key.pub
+
+# Add Chrome yum repo
+yum-config-manager --add-repo=http://dl.google.com/linux/chrome/rpm/stable/x86_64
+
+# Install chrome
+yum install -y google-chrome-stable 
+
+# Install chromedriver
+wget https://chromedriver.storage.googleapis.com/2.16/chromedriver_linux64.zip
+unzip chromedriver_linux64.zip
+mv chromedriver /usr/bin/chromedriver
+chown root /usr/bin/chromedriver
+chmod 755 /usr/bin/chromedriver
+          }, {:timeout=>60*10})
+
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
           #        installed. See BZ#1101508

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

@@ -42,6 +42,9 @@ cp /var/lib/yum/*.pem $contextdir/certs
 cp /etc/yum/vars/* $contextdir/vars
 cp /etc/yum.repos.d/* $contextdir/repos
 
+# remove google chrome repo
+rm -rf $contextdir/repos/*chrome*.repo
+
 # create Dockerfile
 cat <<EOF > $contextdir/Dockerfile
 FROM registry.access.redhat.com/rhel7:latest

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

@@ -73,6 +73,7 @@ popd >/dev/null
             cmd_env << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts'
             cmd_env << 'LOG_DIR=/tmp/origin/e2e/logs'
             cmd_env << 'TEST_ASSETS=true'
+            cmd_env << 'TEST_ASSETS_HEADLESS=true'
             build_targets << 'test'
             # we want to test the output of build-release, this flag tells the makefile to skip the build dependency
             # so the command comes out to <cmd_env settings> make test SKIP_BUILD=true
@@ -93,6 +94,8 @@ popd >/dev/null
           env[:test_exit_code] = run_tests(env, [cmd], true)
 
           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)
           end

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

@@ -35,6 +35,7 @@ module Vagrant
 
           if @options[:all]
             cmds << 'STI_TIMEOUT="--timeout 240s" hack/test-integration.sh'
+            cmds << 'hack/test-stirunimage.sh'
           end
 
           tests = ''
@@ -51,7 +52,7 @@ echo '***************************************************'
           _,_,env[:test_exit_code] = sudo(env[:machine], %{
 set -e
 pushd #{Constants.build_dir}/source-to-image >/dev/null
-export PATH=$GOPATH/bin:$PATH
+export PATH=$GOPATH/bin:$PATH:/data/src/github.com/openshift/source-to-image/_output/local/go/bin
 #{tests}
 popd >/dev/null
           }, {:timeout => 60*60, :fail_on_error => false, :verbose => false})

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

@@ -30,7 +30,7 @@ module Vagrant
             :no_base  => false,
             :os       => 'centos7',
             :stage    => 'inst',
-            :instance_type => 'c3.large',
+            :instance_type => 't2.medium',
             :port_mappings => [],
             :no_synced_folders => false,
             :no_insert_key => false

data/lib/vagrant-openshift/constants.rb

@@ -39,6 +39,7 @@ module Vagrant
           'openshift/perl-516'      => 'https://github.com/openshift/sti-perl.git',
           'openshift/perl-520'      => 'https://github.com/openshift/sti-perl.git',
           'openshift/php-55'        => 'https://github.com/openshift/sti-php.git',
+          'openshift/php-56'        => 'https://github.com/openshift/sti-php.git',
           'openshift/python-27'     => 'https://github.com/openshift/sti-python.git',
           'openshift/python-33'     => 'https://github.com/openshift/sti-python.git',
           'openshift/python-34'     => 'https://github.com/openshift/sti-python.git',

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake