vagrant-openshift 3.0.1 → 3.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/vagrant-openshift/action/install_origin_base_dependencies.rb +43 -1
- data/lib/vagrant-openshift/action/push_openshift_images.rb +1 -1
- data/lib/vagrant-openshift/action/run_origin_tests.rb +1 -1
- data/lib/vagrant-openshift/action/run_sti_tests.rb +1 -1
- data/lib/vagrant-openshift/command/origin_init.rb +1 -1
- data/lib/vagrant-openshift/command/test_origin_image.rb +1 -1
- 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: 1584aaecd50419fb014eed0a6f3bad0873b81626
|
|
4
|
+
data.tar.gz: d06b80e9a2c6091157c2c87520ebbba1ee34b666
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4ddb3d7fc7d20ef670454074b287bbf37cce4b51da7f2a3713294270e7c93a13f59e773283058088b27c9f071be7c9d79a35fb2ee671ebbdf38dbae1dae06d9a
|
|
7
|
+
data.tar.gz: b062a6d37cd9d36120260861e7b38c28b48621d9f4e7a0c2aed11e98642f2cf1e2e692da24cd8f3a4c1cc8c56676aac21ed805ae0b5bbef9d030110e07da9596
|
|
@@ -39,7 +39,49 @@ fi
|
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
ssh_user = env[:machine].ssh_info[:username]
|
|
42
|
-
sudo(env[:machine], "yum install -y
|
|
42
|
+
sudo(env[:machine], "yum install -y \
|
|
43
|
+
augeas \
|
|
44
|
+
bzr \
|
|
45
|
+
bridge-utils \
|
|
46
|
+
bzip2 \
|
|
47
|
+
bind \
|
|
48
|
+
btrfs-progs-devel \
|
|
49
|
+
bind-utils \
|
|
50
|
+
ctags \
|
|
51
|
+
device-mapper-devel \
|
|
52
|
+
docker-io \
|
|
53
|
+
ethtool \
|
|
54
|
+
e2fsprogs \
|
|
55
|
+
fontconfig \
|
|
56
|
+
git \
|
|
57
|
+
gcc \
|
|
58
|
+
gcc-c++ \
|
|
59
|
+
glibc-static \
|
|
60
|
+
httpie \
|
|
61
|
+
hg \
|
|
62
|
+
jq \
|
|
63
|
+
java-1.?.0-openjdk \
|
|
64
|
+
kernel-devel \
|
|
65
|
+
libselinux-devel \
|
|
66
|
+
libnetfilter_queue-devel \
|
|
67
|
+
make \
|
|
68
|
+
mlocate \
|
|
69
|
+
ntp \
|
|
70
|
+
openldap-clients \
|
|
71
|
+
openvswitch \
|
|
72
|
+
rubygems \
|
|
73
|
+
screen \
|
|
74
|
+
socat \
|
|
75
|
+
sqlite-devel \
|
|
76
|
+
tig \
|
|
77
|
+
tmux \
|
|
78
|
+
unzip \
|
|
79
|
+
vim \
|
|
80
|
+
wget \
|
|
81
|
+
xfsprogs \
|
|
82
|
+
Xvfb \
|
|
83
|
+
yum-utils",:timeout=>60*20, :verbose => false)
|
|
84
|
+
|
|
43
85
|
sudo(env[:machine], "yum install -y facter", fail_on_error: false, :timeout=>60*10, :verbose => false)
|
|
44
86
|
|
|
45
87
|
# Install Chrome and chromedriver for headless UI testing
|
|
@@ -148,7 +148,7 @@ docker pull #{@options[:registry]}openshift/base-rhel7
|
|
|
148
148
|
|
|
149
149
|
cmd += %{
|
|
150
150
|
# so we can call s2i
|
|
151
|
-
export PATH=/data/src/github.com/openshift/source-to-image/_output/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/
|
|
151
|
+
export PATH=/data/src/github.com/openshift/source-to-image/_output/local/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/bin/linux/amd64:$PATH
|
|
152
152
|
}
|
|
153
153
|
|
|
154
154
|
# FIXME: We always need to make sure we have the latest base image
|
|
@@ -124,7 +124,7 @@ popd >/dev/null
|
|
|
124
124
|
if bucket.include?('(')
|
|
125
125
|
focus = bucket.slice(bucket.index("(")+1..-2).split(" ").map { |i| Shellwords.escape(i.strip) }.join(" ")
|
|
126
126
|
name = Shellwords.escape(bucket.slice(0..bucket.index("(")-1))
|
|
127
|
-
cmds << "test/extended/#{name.strip}.sh
|
|
127
|
+
cmds << "test/extended/#{name.strip}.sh --ginkgo.focus=\"#{focus}\""
|
|
128
128
|
else
|
|
129
129
|
cmds << "test/extended/#{Shellwords.escape(bucket.strip)}.sh"
|
|
130
130
|
end
|
|
@@ -52,7 +52,7 @@ echo '***************************************************'
|
|
|
52
52
|
_,_,env[:test_exit_code] = sudo(env[:machine], %{
|
|
53
53
|
set -e
|
|
54
54
|
pushd #{Constants.build_dir}/source-to-image >/dev/null
|
|
55
|
-
export PATH
|
|
55
|
+
export PATH=/data/src/github.com/openshift/source-to-image/_output/local/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/bin/linux/amd64:$PATH
|
|
56
56
|
#{tests}
|
|
57
57
|
popd >/dev/null
|
|
58
58
|
}, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
|
|
@@ -103,7 +103,7 @@ EOF
|
|
|
103
103
|
fi
|
|
104
104
|
|
|
105
105
|
# so we can call sti
|
|
106
|
-
export PATH=/data/src/github.com/openshift/source-to-image/_output/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/
|
|
106
|
+
export PATH=/data/src/github.com/openshift/source-to-image/_output/local/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/bin/linux/amd64:$PATH
|
|
107
107
|
|
|
108
108
|
# create a temp dir to play in
|
|
109
109
|
temp_dir=$(mktemp -d /tmp/image_test.XXXXXXX)
|
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: 3.0.
|
|
4
|
+
version: 3.0.2
|
|
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-11-
|
|
11
|
+
date: 2015-11-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|