vagrant-openshift 1.0.12 → 1.0.13
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/.gitignore +1 -0
- data/README.asciidoc +5 -3
- data/lib/vagrant-openshift/action/build_openshift3.rb +30 -5
- data/lib/vagrant-openshift/action/{install_rhc.rb → build_openshift3_base_images.rb} +13 -11
- data/lib/vagrant-openshift/action/{run_openshift2_tests.rb → build_sti.rb} +28 -11
- data/lib/vagrant-openshift/action/clean.rb +1 -4
- data/lib/vagrant-openshift/action/clean_network_setup.rb +1 -1
- data/lib/vagrant-openshift/action/download_artifacts_openshift3.rb +4 -1
- data/lib/vagrant-openshift/action/{download_artifacts_openshift2.rb → download_artifacts_sti.rb} +3 -11
- data/lib/vagrant-openshift/action/generate_template.rb +38 -40
- data/lib/vagrant-openshift/action/install_openshift3.rb +5 -16
- data/lib/vagrant-openshift/action/{build_openshift2.rb → install_openshift3_asset_dependencies.rb} +17 -5
- data/lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb +20 -5
- data/lib/vagrant-openshift/action/{local_openshift2_checkout.rb → push_openshift3_release.rb} +14 -14
- data/lib/vagrant-openshift/action/run_openshift3_tests.rb +38 -14
- data/lib/vagrant-openshift/action/run_sti_tests.rb +64 -0
- data/lib/vagrant-openshift/action.rb +44 -83
- data/lib/vagrant-openshift/command/build_openshift3.rb +9 -0
- data/lib/vagrant-openshift/command/{build_openshift2_base.rb → build_openshift3_base_images.rb} +5 -5
- data/lib/vagrant-openshift/command/{build_openshift3_infrastructure_images.rb → build_sti.rb} +10 -12
- data/lib/vagrant-openshift/command/checkout_repositories.rb +1 -1
- data/lib/vagrant-openshift/command/{install_rhc.rb → install_openshift3_assets_base.rb} +5 -5
- data/lib/vagrant-openshift/command/local_openshift3_setup.rb +1 -1
- data/lib/vagrant-openshift/command/openshift_init.rb +4 -4
- data/lib/vagrant-openshift/command/push_openshift3_release.rb +57 -0
- data/lib/vagrant-openshift/command/repo_sync_openshift3.rb +1 -13
- data/lib/vagrant-openshift/command/{repo_sync_openshift2.rb → repo_sync_sti.rb} +11 -19
- data/lib/vagrant-openshift/command/test_openshift3.rb +8 -0
- data/lib/vagrant-openshift/command/test_openshift3_image.rb +8 -17
- data/lib/vagrant-openshift/command/test_sti.rb +59 -0
- data/lib/vagrant-openshift/config.rb +2 -14
- data/lib/vagrant-openshift/constants.rb +3 -67
- data/lib/vagrant-openshift/helper/command_helper.rb +0 -3
- data/lib/vagrant-openshift/plugin.rb +24 -29
- data/lib/vagrant-openshift/provisioner.rb +5 -37
- data/lib/vagrant-openshift/templates/builder/Rakefile +0 -205
- data/lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml +34 -49
- data/lib/vagrant-openshift/version.rb +1 -1
- metadata +33 -48
- data/lib/vagrant-openshift/action/build_openshift3_images.rb +0 -54
- data/lib/vagrant-openshift/action/build_openshift3_infrastructure_images.rb +0 -50
- data/lib/vagrant-openshift/action/checkout_openshift2_tests.rb +0 -57
- data/lib/vagrant-openshift/action/create_openshift2_puppet_file.rb +0 -84
- data/lib/vagrant-openshift/action/create_openshift2_test_users.rb +0 -36
- data/lib/vagrant-openshift/action/idle_all_gears_openshift2.rb +0 -36
- data/lib/vagrant-openshift/action/install_openshift2_base_dependencies.rb +0 -50
- data/lib/vagrant-openshift/action/install_openshift2_build_dependencies.rb +0 -48
- data/lib/vagrant-openshift/action/preserve_mcollective_logs.rb +0 -48
- data/lib/vagrant-openshift/action/setup_builder_files.rb +0 -57
- data/lib/vagrant-openshift/action/uninstall_openshift2_rpms.rb +0 -37
- data/lib/vagrant-openshift/command/build_openshift3_images.rb +0 -68
- data/lib/vagrant-openshift/command/local_openshift2_setup.rb +0 -62
- data/lib/vagrant-openshift/command/test_openshift2.rb +0 -108
- data/lib/vagrant-openshift/templates/builder/lib/rpm.rb +0 -248
- data/lib/vagrant-openshift/templates/builder/lib/test.rb +0 -432
- data/lib/vagrant-openshift/templates/builder/yum-listbuilddep +0 -124
- data/lib/vagrant-openshift/templates/command/init-openshift/Vagrantfile.erb +0 -171
@@ -1,36 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
|
17
|
-
module Vagrant
|
18
|
-
module Openshift
|
19
|
-
module Action
|
20
|
-
class CreateOpenshift2TestUsers
|
21
|
-
include CommandHelper
|
22
|
-
|
23
|
-
def initialize(app, env)
|
24
|
-
@app = app
|
25
|
-
@env = env
|
26
|
-
end
|
27
|
-
|
28
|
-
def call(env)
|
29
|
-
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
|
30
|
-
sudo env[:machine], "cd #{Constants.build_dir}/builder; #{scl_wrapper(is_fedora,'rake create_test_users')}"
|
31
|
-
@app.call(env)
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|
@@ -1,36 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
|
17
|
-
module Vagrant
|
18
|
-
module Openshift
|
19
|
-
module Action
|
20
|
-
class IdleAllGearsOpenshift2
|
21
|
-
include CommandHelper
|
22
|
-
|
23
|
-
def initialize(app, env)
|
24
|
-
@app = app
|
25
|
-
@env = env
|
26
|
-
end
|
27
|
-
|
28
|
-
def call(env)
|
29
|
-
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
|
30
|
-
sudo env[:machine], "cd #{Constants.build_dir}/builder; #{scl_wrapper(is_fedora,'rake idle_all_gears')}"
|
31
|
-
@app.call(env)
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|
@@ -1,50 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
|
17
|
-
module Vagrant
|
18
|
-
module Openshift
|
19
|
-
module Action
|
20
|
-
class InstallOpenshift2BaseDependencies
|
21
|
-
include CommandHelper
|
22
|
-
|
23
|
-
def initialize(app, env)
|
24
|
-
@app = app
|
25
|
-
@env = env
|
26
|
-
end
|
27
|
-
|
28
|
-
def call(env)
|
29
|
-
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
|
30
|
-
|
31
|
-
if is_fedora
|
32
|
-
unless env[:machine].communicate.test("rpm -q activemq-5.6.0-6.fc19.x86_64")
|
33
|
-
sudo(env[:machine], "yum erase -y activemq")
|
34
|
-
sudo(env[:machine], "yum install -y https://mirror.openshift.com/pub/origin-server/nightly/fedora-19/dependencies/x86_64/activemq-5.6.0-6.fc19.x86_64.rpm")
|
35
|
-
end
|
36
|
-
sudo(env[:machine], "yum install -y rubygem-rake")
|
37
|
-
sudo(env[:machine], "yum install -y rubygem-net-ssh-multi rubygem-net-ssh-gateway")
|
38
|
-
else
|
39
|
-
sudo(env[:machine], "yum install -y activemq")
|
40
|
-
sudo(env[:machine], "yum install -y ruby193-rubygem-rake ruby193-build scl-utils-build")
|
41
|
-
sudo(env[:machine], "yum install -y ruby193-rubygem-net-ssh-multi ruby193-rubygem-net-ssh-gateway")
|
42
|
-
end
|
43
|
-
|
44
|
-
sudo(env[:machine], "cd #{Constants.build_dir + "builder"}; #{scl_wrapper(is_fedora, 'rake install_deps')}", {timeout: 0})
|
45
|
-
@app.call(env)
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
|
17
|
-
module Vagrant
|
18
|
-
module Openshift
|
19
|
-
module Action
|
20
|
-
class InstallOpenshift2BuildDependencies
|
21
|
-
include CommandHelper
|
22
|
-
|
23
|
-
def initialize(app, env)
|
24
|
-
@app = app
|
25
|
-
@env = env
|
26
|
-
end
|
27
|
-
|
28
|
-
def call(env)
|
29
|
-
sudo(env[:machine], "yum install -y puppet git tito yum-utils wget make tig mlocate bind augeas vim")
|
30
|
-
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
|
31
|
-
|
32
|
-
if is_fedora
|
33
|
-
sudo(env[:machine], "yum install -y rubygem-rake rubygem-fakefs")
|
34
|
-
else
|
35
|
-
sudo(env[:machine], "yum install -y ruby193-rubygem-rake ruby193-build scl-utils-build libuv libuv-devel http-parser http-parser-devel createrepo")
|
36
|
-
#test dependencies
|
37
|
-
sudo(env[:machine], "yum install -y ruby193-rubygem-net-ssh ruby193-rubygem-archive-tar-minitar ruby193-rubygem-fakefs ruby193-rubygem-httpclient ruby193-rubygem-test-unit")
|
38
|
-
sudo(env[:machine], "yum install -y ruby193-rubygem-cucumber ruby193-rubygem-simplecov ruby193-rubygem-webmock ruby193-rubygem-poltergeist")
|
39
|
-
|
40
|
-
#rhc client dependencies for SCL Ruby 1.9.3 environment
|
41
|
-
sudo(env[:machine], "yum install -y rubygem-parseconfig ruby193-rubygem-net-ssh-multi ruby193-rubygem-commander ruby193-rubygem-open4")
|
42
|
-
end
|
43
|
-
@app.call(env)
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
|
17
|
-
module Vagrant
|
18
|
-
module Openshift
|
19
|
-
module Action
|
20
|
-
class PreserveMcollectiveLogs
|
21
|
-
include CommandHelper
|
22
|
-
|
23
|
-
def initialize(app, env)
|
24
|
-
@app = app
|
25
|
-
@env = env
|
26
|
-
end
|
27
|
-
|
28
|
-
def call(env)
|
29
|
-
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
|
30
|
-
server_cfg_path = is_fedora ? '/etc/mcollective/server.cfg' : '/opt/rh/ruby193/root/etc/mcollective/server.cfg'
|
31
|
-
|
32
|
-
unless env[:machine].communicate.test("grep 'keeplogs=9999' #{server_cfg_path}")
|
33
|
-
env[:machine].ui.info "Keep all mcollective logs on remote instance"
|
34
|
-
sudo(env[:machine], "echo keeplogs=9999 >> #{server_cfg_path}")
|
35
|
-
|
36
|
-
if is_fedora
|
37
|
-
sudo(env[:machine], "/sbin/service mcollective restart")
|
38
|
-
else
|
39
|
-
sudo(env[:machine], "/sbin/service ruby193-mcollective restart")
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
@app.call(env)
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
@@ -1,57 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
require 'yaml'
|
17
|
-
|
18
|
-
module Vagrant
|
19
|
-
module Openshift
|
20
|
-
module Action
|
21
|
-
class SetupBuilderFiles
|
22
|
-
include CommandHelper
|
23
|
-
|
24
|
-
def initialize(app, env)
|
25
|
-
@app = app
|
26
|
-
@env = env
|
27
|
-
end
|
28
|
-
|
29
|
-
def call(env)
|
30
|
-
ssh_user = env[:machine].ssh_info[:username]
|
31
|
-
sudo(env[:machine], "yum clean all")
|
32
|
-
sudo(env[:machine], "rm -rf #{Constants.build_dir}")
|
33
|
-
sudo(env[:machine], "mkdir -p #{Constants.build_dir}")
|
34
|
-
sudo(env[:machine], "mkdir -p #{Constants.build_dir + "builder"}; chown #{ssh_user}:#{ssh_user} #{Constants.build_dir + "builder"};")
|
35
|
-
env[:machine].communicate.upload(File.expand_path("#{__FILE__}/../../templates/builder"), Constants.build_dir.to_s )
|
36
|
-
env[:machine].communicate.upload(File.expand_path("#{__FILE__}/../../constants.rb"), (Constants.build_dir + "builder/lib/constants.rb").to_s )
|
37
|
-
sudo(env[:machine], "chmod +x #{Constants.build_dir + "builder/yum-listbuilddep"}; chown #{ssh_user}:#{ssh_user} -R #{Constants.build_dir}")
|
38
|
-
remote_write(env[:machine], Constants.build_dir + "builder/lib/options.rb") do
|
39
|
-
%{
|
40
|
-
require 'yaml'
|
41
|
-
OPTIONS = YAML.load(
|
42
|
-
"#{
|
43
|
-
{
|
44
|
-
:ignore_packages => env[:machine].config.openshift.ignore_packages,
|
45
|
-
:cloud_domain => env[:machine].config.openshift.cloud_domain,
|
46
|
-
:additional_services => env[:machine].config.openshift.additional_services,
|
47
|
-
}.to_yaml}"
|
48
|
-
)
|
49
|
-
}
|
50
|
-
end
|
51
|
-
|
52
|
-
@app.call(env)
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
@@ -1,37 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
|
17
|
-
module Vagrant
|
18
|
-
module Openshift
|
19
|
-
module Action
|
20
|
-
class UninstallOpenshift2Rpms
|
21
|
-
include CommandHelper
|
22
|
-
|
23
|
-
def initialize(app, env)
|
24
|
-
@app = app
|
25
|
-
@env = env
|
26
|
-
end
|
27
|
-
|
28
|
-
def call(env)
|
29
|
-
is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
|
30
|
-
sudo env[:machine], "cd #{Constants.build_dir + "builder; #{scl_wrapper(is_fedora,'rake clean_rpms')}"}"
|
31
|
-
sudo env[:machine], "rm -rf #{Constants.build_dir + "origin-rpms"} #{Constants.build_dir + "origin-srpms"} #{Constants.build_dir + ".built_packages"} #{Constants.build_dir + ".spec_cache"}"
|
32
|
-
@app.call(env)
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
@@ -1,68 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
require_relative "../action"
|
17
|
-
|
18
|
-
module Vagrant
|
19
|
-
module Openshift
|
20
|
-
module Commands
|
21
|
-
class BuildOpenshift3Images < Vagrant.plugin(2, :command)
|
22
|
-
include CommandHelper
|
23
|
-
|
24
|
-
def self.synopsis
|
25
|
-
"builds openshift docker images"
|
26
|
-
end
|
27
|
-
|
28
|
-
def execute
|
29
|
-
options = {}
|
30
|
-
options[:clean] = false
|
31
|
-
options[:local_source] = false
|
32
|
-
|
33
|
-
opts = OptionParser.new do |o|
|
34
|
-
o.banner = "Usage: vagrant build-openshift3-images --openshift3-images image_name [vm-name]"
|
35
|
-
o.separator ""
|
36
|
-
|
37
|
-
o.on("-b [branch_name]", "--branch [branch_name]", String, "Check out the specified branch. Default is 'master'.") do |f|
|
38
|
-
options[:branch] = {"origin-server" => f}
|
39
|
-
end
|
40
|
-
|
41
|
-
o.on("-f", "--force", "Force a rebuild of the images even if there has not been a change to the source.") do |c|
|
42
|
-
options[:force] = true
|
43
|
-
end
|
44
|
-
|
45
|
-
o.on("--openshift3-images #{Vagrant::Openshift::Constants.openshift3_images.keys.join(' ')} | all", "Specify which images should be built. Default: []") do |f|
|
46
|
-
if f.split(" ").include?("all")
|
47
|
-
options[:openshift3_images] = Vagrant::Openshift::Constants.openshift3_images.keys
|
48
|
-
else
|
49
|
-
options[:openshift3_images] = f.split(" ")
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
53
|
-
|
54
|
-
# Parse the options
|
55
|
-
argv = parse_options(opts)
|
56
|
-
return if !argv
|
57
|
-
raise Vagrant::Errors::CLIInvalidUsage, help: opts.help.chomp unless options[:openshift3_images]
|
58
|
-
|
59
|
-
with_target_vms(argv, :reverse => true) do |machine|
|
60
|
-
actions = Vagrant::Openshift::Action.build_openshift3_images(options)
|
61
|
-
@env.action_runner.run actions, {:machine => machine}
|
62
|
-
0
|
63
|
-
end
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
end
|
@@ -1,62 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
require_relative "../action"
|
17
|
-
|
18
|
-
module Vagrant
|
19
|
-
module Openshift
|
20
|
-
module Commands
|
21
|
-
class LocalOpenshift2Setup < Vagrant.plugin(2, :command)
|
22
|
-
include CommandHelper
|
23
|
-
|
24
|
-
def self.synopsis
|
25
|
-
"clones the openshift repos into the current directory"
|
26
|
-
end
|
27
|
-
|
28
|
-
def execute
|
29
|
-
options = {
|
30
|
-
:branch => 'master',
|
31
|
-
:replace => false,
|
32
|
-
}
|
33
|
-
|
34
|
-
opts = OptionParser.new do |o|
|
35
|
-
o.banner = "Usage: vagrant openshift3-local-checkout [options]"
|
36
|
-
o.separator ""
|
37
|
-
|
38
|
-
o.on("-b [branch_name]", "--branch [branch_name]", String, "Check out the specified branch. Default is 'master'.") do |f|
|
39
|
-
options[:branch] = f
|
40
|
-
end
|
41
|
-
|
42
|
-
o.on("-u [username]", "--user [username]", String, "Your GitHub username. If provided, Vagrant will attempt to clone your forks of the Origin repos. If not provided, or if the forks cannot be found, Vagrant will clone read-only copies of the OpenShift repos.") do |f|
|
43
|
-
options[:user] = f
|
44
|
-
end
|
45
|
-
|
46
|
-
o.on("-r", "--replace", "Delete existing cloned dirs first. Default is to skip repos that are already cloned.") do |f|
|
47
|
-
options[:replace] = f
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
# Parse the options
|
52
|
-
argv = parse_options(opts)
|
53
|
-
return if !argv
|
54
|
-
|
55
|
-
actions = Vagrant::Openshift::Action.local_openshift2_checkout(options)
|
56
|
-
@env.action_runner.run actions
|
57
|
-
0
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
end
|
62
|
-
end
|
@@ -1,108 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Copyright 2013 Red Hat, Inc.
|
3
|
-
#
|
4
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
# you may not use this file except in compliance with the License.
|
6
|
-
# You may obtain a copy of the License at
|
7
|
-
#
|
8
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
#
|
10
|
-
# Unless required by applicable law or agreed to in writing, software
|
11
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
# See the License for the specific language governing permissions and
|
14
|
-
# limitations under the License.
|
15
|
-
#++
|
16
|
-
require_relative "../action"
|
17
|
-
|
18
|
-
module Vagrant
|
19
|
-
module Openshift
|
20
|
-
module Commands
|
21
|
-
class TestOpenshift2 < Vagrant.plugin(2, :command)
|
22
|
-
include CommandHelper
|
23
|
-
|
24
|
-
def self.synopsis
|
25
|
-
"run the OpenShift tests"
|
26
|
-
end
|
27
|
-
|
28
|
-
def component_list
|
29
|
-
[:node,:cart,:gear,:broker,:console,:rhc]
|
30
|
-
end
|
31
|
-
|
32
|
-
def execute
|
33
|
-
options = {}
|
34
|
-
options[:extended] = false
|
35
|
-
options[:download] = false
|
36
|
-
component_list.each { |component| options[component] = false }
|
37
|
-
|
38
|
-
opts = OptionParser.new do |o|
|
39
|
-
o.banner = "Usage: vagrant test-openshift2 [machine-name]"
|
40
|
-
o.separator ""
|
41
|
-
|
42
|
-
o.on("-n", "--node", String, "Run node tests") do |f|
|
43
|
-
options[:node] = true
|
44
|
-
end
|
45
|
-
|
46
|
-
o.on("-t", "--cart", "--cartridge", String, "Run cartridge tests") do |f|
|
47
|
-
options[:cart] = true
|
48
|
-
end
|
49
|
-
|
50
|
-
o.on("-g", "--gear", String, "Run gear tests") do |f|
|
51
|
-
options[:gear] = true
|
52
|
-
end
|
53
|
-
|
54
|
-
o.on("-b", "--broker", String, "Run broker tests") do |f|
|
55
|
-
options[:broker] = true
|
56
|
-
end
|
57
|
-
|
58
|
-
o.on("-r", "--rhc", String, "Run CLI tests") do |f|
|
59
|
-
options[:rhc] = true
|
60
|
-
end
|
61
|
-
|
62
|
-
o.on("-c", "--console", String, "Run console/web tests") do |f|
|
63
|
-
options[:console] = true
|
64
|
-
end
|
65
|
-
|
66
|
-
o.on("-e", "--extended", String, "Run extended tests") do |f|
|
67
|
-
options[:extended] = true
|
68
|
-
end
|
69
|
-
|
70
|
-
o.on("-a", "--all", String, "Run all tests") do |f|
|
71
|
-
component_list.each { |component| options[component] = true }
|
72
|
-
end
|
73
|
-
|
74
|
-
o.on("-d","--artifacts", String, "Download logs and rpms") do |f|
|
75
|
-
options[:download] = true
|
76
|
-
end
|
77
|
-
|
78
|
-
o.on("--fixme", "Run known broken tests to verify test fixes") do |f|
|
79
|
-
options[:fixme] = true
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
# Parse the options
|
84
|
-
argv = parse_options(opts)
|
85
|
-
return if !argv
|
86
|
-
|
87
|
-
# Figure out if we are implicitly running all tests
|
88
|
-
do_all = true
|
89
|
-
component_list.each do |component|
|
90
|
-
if options[component]
|
91
|
-
do_all = false
|
92
|
-
break
|
93
|
-
end
|
94
|
-
end
|
95
|
-
if do_all
|
96
|
-
component_list.each { |component| options[component] = true }
|
97
|
-
end
|
98
|
-
|
99
|
-
with_target_vms(argv, :reverse => true) do |machine|
|
100
|
-
actions = Vagrant::Openshift::Action.run_openshift2_tests(options)
|
101
|
-
@env.action_runner.run actions, {:machine => machine}
|
102
|
-
0
|
103
|
-
end
|
104
|
-
end
|
105
|
-
end
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|