vagrant-openshift 2.0.4 → 2.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/vagrant-openshift/action/download_artifacts_openshift.rb +1 -0
- data/lib/vagrant-openshift/action/install_openshift_base_dependencies.rb +24 -1
- data/lib/vagrant-openshift/action/install_openshift_rhel7.rb +3 -0
- data/lib/vagrant-openshift/action/run_openshift_tests.rb +3 -0
- data/lib/vagrant-openshift/action/run_sti_tests.rb +2 -1
- data/lib/vagrant-openshift/command/openshift_init.rb +1 -1
- data/lib/vagrant-openshift/constants.rb +1 -0
- data/lib/vagrant-openshift/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 75a4e67fcac9744e3730fe8000bbb32e895a0ad1
|
4
|
+
data.tar.gz: 72853ef81bc88d08f18f2a5829d81a21c42ba0aa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d14ba4ce9dcc87fdb0d0f8ae293952e96e5d025cd30788e916848107e1de310e12326a828a3e8ecc55516b4c2c0c3a226fb719ef2e44f6624a544262ee47318b
|
7
|
+
data.tar.gz: 2efa25d0faa6896c8d850272e9df17ce2aeb82d7807465f1fcad48e3410ef0866cd2a4e2ed859ef1d6a221769a54e4e7491537ffeed5ca243e1d74a053642537
|
@@ -38,6 +38,7 @@ module Vagrant
|
|
38
38
|
"/var/log/secure" => artifacts_dir + "secure",
|
39
39
|
"/var/log/audit/audit.log" => artifacts_dir + "audit.log",
|
40
40
|
"/tmp/origin/e2e/" => artifacts_dir + "e2e/",
|
41
|
+
"/tmp/openshift-extended-tests/" => artifacts_dir + "extended-tests/",
|
41
42
|
"/tmp/openshift-cmd/" => artifacts_dir + "cmd/",
|
42
43
|
|
43
44
|
"/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
|
@@ -42,8 +42,31 @@ fi
|
|
42
42
|
# FIXME: Move 'openshift/centos-mongodb' into openshift org and then
|
43
43
|
# add the image into 'repositories' constants
|
44
44
|
#
|
45
|
-
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})
|
45
|
+
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})
|
46
46
|
sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*10})
|
47
|
+
|
48
|
+
# Install Chrome and chromedriver for headless UI testing
|
49
|
+
sudo(env[:machine], %{
|
50
|
+
cd /tmp
|
51
|
+
|
52
|
+
# Add signing key for Chrome repo
|
53
|
+
wget https://dl.google.com/linux/linux_signing_key.pub
|
54
|
+
rpm --import linux_signing_key.pub
|
55
|
+
|
56
|
+
# Add Chrome yum repo
|
57
|
+
yum-config-manager --add-repo=http://dl.google.com/linux/chrome/rpm/stable/x86_64
|
58
|
+
|
59
|
+
# Install chrome
|
60
|
+
yum install -y google-chrome-stable
|
61
|
+
|
62
|
+
# Install chromedriver
|
63
|
+
wget https://chromedriver.storage.googleapis.com/2.16/chromedriver_linux64.zip
|
64
|
+
unzip chromedriver_linux64.zip
|
65
|
+
mv chromedriver /usr/bin/chromedriver
|
66
|
+
chown root /usr/bin/chromedriver
|
67
|
+
chmod 755 /usr/bin/chromedriver
|
68
|
+
}, {:timeout=>60*10})
|
69
|
+
|
47
70
|
#
|
48
71
|
# FIXME: Need to install golang packages 'after' the 'gcc' is
|
49
72
|
# installed. See BZ#1101508
|
@@ -42,6 +42,9 @@ cp /var/lib/yum/*.pem $contextdir/certs
|
|
42
42
|
cp /etc/yum/vars/* $contextdir/vars
|
43
43
|
cp /etc/yum.repos.d/* $contextdir/repos
|
44
44
|
|
45
|
+
# remove google chrome repo
|
46
|
+
rm -rf $contextdir/repos/*chrome*.repo
|
47
|
+
|
45
48
|
# create Dockerfile
|
46
49
|
cat <<EOF > $contextdir/Dockerfile
|
47
50
|
FROM registry.access.redhat.com/rhel7:latest
|
@@ -73,6 +73,7 @@ popd >/dev/null
|
|
73
73
|
cmd_env << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts'
|
74
74
|
cmd_env << 'LOG_DIR=/tmp/origin/e2e/logs'
|
75
75
|
cmd_env << 'TEST_ASSETS=true'
|
76
|
+
cmd_env << 'TEST_ASSETS_HEADLESS=true'
|
76
77
|
build_targets << 'test'
|
77
78
|
# we want to test the output of build-release, this flag tells the makefile to skip the build dependency
|
78
79
|
# so the command comes out to <cmd_env settings> make test SKIP_BUILD=true
|
@@ -93,6 +94,8 @@ popd >/dev/null
|
|
93
94
|
env[:test_exit_code] = run_tests(env, [cmd], true)
|
94
95
|
|
95
96
|
if env[:test_exit_code] == 0 && @options[:extended_test_packages].length > 0
|
97
|
+
# for extended tests we need a ginkgo binary
|
98
|
+
do_execute(env[:machine], "go get github.com/onsi/ginkgo/ginkgo", {:timeout => 60*60*2, :fail_on_error => true, :verbose => false})
|
96
99
|
extended_cmd = 'hack/test-extended.sh ' + Shellwords.escape(@options[:extended_test_packages])
|
97
100
|
env[:test_exit_code] = run_tests(env, [extended_cmd], true)
|
98
101
|
end
|
@@ -35,6 +35,7 @@ module Vagrant
|
|
35
35
|
|
36
36
|
if @options[:all]
|
37
37
|
cmds << 'STI_TIMEOUT="--timeout 240s" hack/test-integration.sh'
|
38
|
+
cmds << 'hack/test-stirunimage.sh'
|
38
39
|
end
|
39
40
|
|
40
41
|
tests = ''
|
@@ -51,7 +52,7 @@ echo '***************************************************'
|
|
51
52
|
_,_,env[:test_exit_code] = sudo(env[:machine], %{
|
52
53
|
set -e
|
53
54
|
pushd #{Constants.build_dir}/source-to-image >/dev/null
|
54
|
-
export PATH=$GOPATH/bin:$PATH
|
55
|
+
export PATH=$GOPATH/bin:$PATH:/data/src/github.com/openshift/source-to-image/_output/local/go/bin
|
55
56
|
#{tests}
|
56
57
|
popd >/dev/null
|
57
58
|
}, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
|
@@ -39,6 +39,7 @@ module Vagrant
|
|
39
39
|
'openshift/perl-516' => 'https://github.com/openshift/sti-perl.git',
|
40
40
|
'openshift/perl-520' => 'https://github.com/openshift/sti-perl.git',
|
41
41
|
'openshift/php-55' => 'https://github.com/openshift/sti-php.git',
|
42
|
+
'openshift/php-56' => 'https://github.com/openshift/sti-php.git',
|
42
43
|
'openshift/python-27' => 'https://github.com/openshift/sti-python.git',
|
43
44
|
'openshift/python-33' => 'https://github.com/openshift/sti-python.git',
|
44
45
|
'openshift/python-34' => 'https://github.com/openshift/sti-python.git',
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-openshift
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Red Hat
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-08-
|
11
|
+
date: 2015-08-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|