vagrant-openshift 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3fe170f2452ac6b16bb9b59aae8b97b545d4fc2
-  data.tar.gz: 19294c1010b526c4b390e8a365066b115e0bd936
+  metadata.gz: 1f801d1a034a23c6ed705d62ff7b4117170cf03b
+  data.tar.gz: ef9e37029fd017195bdd6752946d064a7eb34a37
 SHA512:
-  metadata.gz: 108a4d36deec143097fc7b8f5379f796f5ed70271809a0d9e94adea90694e5c22ed0d503da7312e812e2be695f8ca5d7a4d7a4162c09be0d736961c3358e4743
-  data.tar.gz: fb31ad53478510a18bb165e3fa69f19df98fa1254086dd9f2d211ce1fb17114f068f7352e6395456b4ab80e9ceaab05d616ecce45d131a8be62daaa6ae168a82
+  metadata.gz: 3322ccb80bc697835fa435b6a2be8eaa7ef8eed49a8ef341d22a759a24aa13ab5e4473e041073e7f4a3c6b5a94b176e783aa9a433ade67d5ee4fbb66851c5d7f
+  data.tar.gz: ff6d96ec3325ef751c8209b09e73a50ef53590d6829628564b7641d10195609df8cc55114aeabbd198bc99854f1fc8a4315c1ab09c536b8fef9534bec76f3124

data/Gemfile

@@ -7,6 +7,10 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  if File.exist?(File.expand_path("../../vagrant", __FILE__))
+    gem "vagrant", path: "../vagrant"
+  else
+    gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  end
   gem "json"
 end

data/README.asciidoc

@@ -44,15 +44,6 @@ Compile using Rake:
 $ bundle exec rake
 ----
 
-NOTE: If at this point a warning like `git://github.com/mitchellh/vagrant.git (at master) is not yet checked out. Run bundle install first.` appears, run `bundle install` and then re-run `bundle exec rake`. The warning will most likely not go away, but it is safe to proceed regardless.
-
-Install the plugin using Vagrant (only necessary if `bundle exec rake` still failed with the above noted warning):
-
-[source,sh]
-----
-$ vagrant plugin install pkg/vagrant-openshift-<release>.gem
-----
-
 ===== From rubygems.org
 
 Install the published version of this plugin:

data/lib/vagrant-openshift/action.rb

@@ -110,7 +110,6 @@ module Vagrant
             end
             b.use SyncLocalRepository
             b.use CheckoutRepositories
-            b.use InstallOriginAssetDependencies, :restore_assets => true
           end
           if options[:build]
             b.use(BuildOriginBaseImages, options) if options[:images]
@@ -136,6 +135,23 @@ module Vagrant
           end
         end
       end
+      
+      def self.repo_sync_origin_console(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use PrepareSshConfig
+          if options[:source]
+            if options[:clean]
+              b.use Clean, :repo => 'origin-console'
+              b.use CloneUpstreamRepositories, :repo => 'origin-console'
+            end
+            b.use SyncLocalRepository, :repo => 'origin-console'
+            b.use CheckoutRepositories, :repo => 'origin-console'
+            if options[:build]            
+              b.use InstallOriginAssetDependencies, :restore_assets => true
+            end     
+          end
+        end
+      end      
 
       def self.repo_sync_origin_aggregated_logging(options)
         Vagrant::Action::Builder.new.tap do |b|
@@ -174,6 +190,18 @@ module Vagrant
           b.use TestExitCode
         end
       end
+      
+      def self.run_origin_asset_tests(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          # UI integration tests require the api server to be running
+          b.use RunSystemctl, {:action => "start", :service => "openshift"}        
+          b.use RunOriginAssetTests, options
+          if options[:download]
+            b.use DownloadArtifactsOriginConsole
+          end
+          b.use TestExitCode
+        end
+      end      
 
       def self.run_origin_aggregated_logging_tests(options)
         Vagrant::Action::Builder.new.tap do |b|
@@ -212,6 +240,12 @@ module Vagrant
           b.use DownloadArtifactsOriginAggregatedLogging
         end
       end
+      
+      def self.download_origin_console_artifacts(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use DownloadArtifactsOriginConsole
+        end
+      end      
 
       def self.gen_template(options)
         Vagrant::Action::Builder.new.tap do |b|
@@ -290,6 +324,7 @@ module Vagrant
       autoload :LocalOriginCheckout, action_root.join("local_origin_checkout")
       autoload :CreateBareRepoPlaceholders, action_root.join("create_bare_repo_placeholders")
       autoload :RunOriginTests, action_root.join("run_origin_tests")
+      autoload :RunOriginAssetTests, action_root.join("run_origin_asset_tests")      
       autoload :RunStiTests, action_root.join("run_sti_tests")
       autoload :RunOriginAggregatedLoggingTests, action_root.join("run_origin_aggregated_logging_tests")
       autoload :GenerateTemplate, action_root.join("generate_template")
@@ -297,6 +332,7 @@ module Vagrant
       autoload :ModifyInstance, action_root.join("modify_instance")
       autoload :ModifyAMI, action_root.join("modify_ami")
       autoload :DownloadArtifactsOrigin, action_root.join("download_artifacts_origin")
+      autoload :DownloadArtifactsOriginConsole, action_root.join("download_artifacts_origin_console")      
       autoload :DownloadArtifactsSti, action_root.join("download_artifacts_sti")
       autoload :DownloadArtifactsOriginAggregatedLogging, action_root.join("download_artifacts_origin_aggregated_logging")
       autoload :TestExitCode, action_root.join("test_exit_code")

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

@@ -37,7 +37,7 @@ module Vagrant
 if [ -d #{bare_repo_path} ]; then
 rm -rf #{repo_path}
 echo 'Cloning #{repo_name} ...'
-git clone --quiet #{bare_repo_path} #{repo_path}
+git clone --quiet --recurse-submodules #{bare_repo_path} #{repo_path}
 }
 
             if @options[:branch] && @options[:branch][repo_name]
@@ -65,4 +65,4 @@ fi
       end
     end
   end
-end
+end

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

@@ -38,9 +38,7 @@ module Vagrant
             "/var/log/yum.log"               => artifacts_dir + "yum.log",
             "/var/log/secure"                => artifacts_dir + "secure",
             "/var/log/audit/audit.log"       => artifacts_dir + "audit.log",
-            "/tmp/openshift/"                => artifacts_dir,
-
-            "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/"
+            "/tmp/openshift/"                => artifacts_dir
           }
 
           if @options[:download_release]

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

@@ -0,0 +1,74 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require 'pathname'
+
+module Vagrant
+  module Openshift
+    module Action
+      class DownloadArtifactsOriginConsole
+        include CommandHelper
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          machine = @env[:machine]
+          machine.ui.info "Downloading any failure screenshots"
+          ssh_info = machine.ssh_info
+          private_key_path = ssh_info[:private_key_path].kind_of?(Array) ? ssh_info[:private_key_path][0] : ssh_info[:private_key_path]
+
+          artifacts_dir = Pathname.new(File.expand_path(machine.env.root_path + "artifacts"))
+
+          _,_,exit_code = do_execute machine, "mkdir -p /tmp/openshift && journalctl -u openshift --no-pager > /tmp/openshift/openshift.log", :fail_on_error => false
+          if exit_code != 0 
+            machine.ui.warn "Unable to dump openshift log from journalctl"
+          end
+          
+          download_map = {
+            "/var/log/yum.log"               => artifacts_dir + "yum.log",
+            "/var/log/secure"                => artifacts_dir + "secure",
+            "/var/log/audit/audit.log"       => artifacts_dir + "audit.log",
+            "/tmp/openshift/"                => artifacts_dir,
+            "/data/src/github.com/openshift/origin-web-console/test/tmp/screenshots/" => artifacts_dir + "screenshots/"
+          }
+
+          download_map.each do |source,target|
+            if ! machine.communicate.test("sudo ls #{source}")
+              machine.ui.info "#{source} did not exist on the remote system.  This is often the case for tests that were not run."
+              next
+            end
+
+            machine.ui.info "Downloading artifacts from '#{source}' to '#{target}'"
+            if target.to_s.end_with? '/'
+              FileUtils.mkdir_p target.to_s
+            else
+              FileUtils.mkdir_p File.dirname(target.to_s)
+            end
+
+            command = "/usr/bin/rsync -az -e 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' --exclude='volumes/*' --exclude='volumes/' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
+
+            if not system(command)
+              machine.ui.warn "Unable to download artifacts"
+            end
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module Vagrant
           cmd = %{
 set -ex
 
-ORIGIN_PATH=/data/src/github.com/openshift/origin
+ORIGIN_CONSOLE_PATH=/data/src/github.com/openshift/origin-web-console
 ASSET_BACKUP_DIR=/data/asset_dependencies
 
 if ! which npm > /dev/null 2>&1 ; then
@@ -45,16 +45,16 @@ fi
   # make sure the dirs always exist
   mkdir -p /data/asset_dependencies/node_modules
   mkdir -p /data/asset_dependencies/bower_components
-  # copy them to the assets dir
-  cp -rf $ASSET_BACKUP_DIR/node_modules $ORIGIN_PATH/assets/node_modules
-  cp -rf $ASSET_BACKUP_DIR/bower_components $ORIGIN_PATH/assets/bower_components
+  # copy them to the console repo
+  cp -rf $ASSET_BACKUP_DIR/node_modules $ORIGIN_CONSOLE_PATH/node_modules
+  cp -rf $ASSET_BACKUP_DIR/bower_components $ORIGIN_CONSOLE_PATH/bower_components
 
 }
           end
 
           cmd += %{
-pushd $ORIGIN_PATH
-  hack/install-assets.sh
+pushd $ORIGIN_CONSOLE_PATH
+  hack/install-deps.sh
 popd
 
 }
@@ -62,12 +62,12 @@ popd
           if @options[:backup_assets]
             cmd += %{
   # Make sure tests pass before backing up this asset install
-  pushd $ORIGIN_PATH
-    hack/test-assets.sh
+  pushd $ORIGIN_CONSOLE_PATH
+    grunt test
   popd
   mkdir -p $ASSET_BACKUP_DIR
-  cp -rf $ORIGIN_PATH/assets/node_modules $ASSET_BACKUP_DIR/node_modules
-  cp -rf $ORIGIN_PATH/assets/bower_components $ASSET_BACKUP_DIR/bower_components
+  cp -rf $ORIGIN_CONSOLE_PATH/node_modules $ASSET_BACKUP_DIR/node_modules
+  cp -rf $ORIGIN_CONSOLE_PATH/bower_components $ASSET_BACKUP_DIR/bower_components
 }
           end
 

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

@@ -131,6 +131,8 @@ chown root /usr/bin/chromedriver
 chmod 755 /usr/bin/chromedriver
           }, :timeout=>60*60, :verbose => false)
 
+          sudo(env[:machine], "wget -O /etc/yum.repos.d/openshift-rhel7-dependencies.repo https://mirror.openshift.com/pub/openshift-origin/nightly/rhel-7/dependencies/openshift-rhel7-dependencies.repo", fail_on_error: true, :timeout=>60*20, :verbose => true)
+
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
           #        installed. See BZ#1101508

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

@@ -56,11 +56,11 @@ docker tag -f #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}
 # We can't fully parallelize this because docker fails when you push to the same repo at the
 # same time (using different tags), so we do two groups of push operations.
 # this one is failing in parallel for unknown reasons
-docker push -f #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
+docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
 
-procs[0]="docker push -f #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}"
-procs[1]="docker push -f docker.io/#{centos_namespace}/#{image_name}-centos7:latest"
-#procs[2]="docker push -f #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}"
+procs[0]="docker push #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}"
+procs[1]="docker push docker.io/#{centos_namespace}/#{image_name}-centos7:latest"
+#procs[2]="docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}"
 
 # Run pushes in parallel
 for i in {0..1}; do
@@ -76,8 +76,8 @@ for pid in ${pids[*]}; do
   wait $pid
 done
 
-procs[0]="docker push -f #{registry}#{centos_namespace}/#{image_name}-centos7:latest"
-procs[1]="docker push -f #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest"
+procs[0]="docker push #{registry}#{centos_namespace}/#{image_name}-centos7:latest"
+procs[1]="docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest"
 
 # Run pushes in parallel
 for i in {0..1}; do

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

@@ -0,0 +1,82 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Vagrant
+  module Openshift
+    module Action
+      class RunOriginAssetTests
+        include CommandHelper
+
+        @@SSH_TIMEOUT = 4800
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options.clone
+        end
+
+        def run_tests(env, cmds, as_root=true)
+          tests = ''
+          cmds.each do |cmd|
+            tests += "
+echo '***************************************************'
+echo 'Running #{cmd}...'
+time #{cmd}
+echo 'Finished #{cmd}'
+echo '***************************************************'
+"
+          end
+          cmd = %{
+set -e
+pushd #{Constants.build_dir}/origin-web-console >/dev/null
+export PATH=$GOPATH/bin:$PATH
+#{tests}
+popd >/dev/null
+        }
+          exit_code = 0
+          if as_root
+            _,_,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*4, :fail_on_error => false, :verbose => false})
+          end
+          exit_code
+        end
+
+        #
+        # All env vars will be added to the beginning of the commands
+        #
+        def call(env)
+          @options.delete :logs
+
+          cmds = []
+
+          if @options[:envs]
+            cmds += @options[:envs]
+          end
+
+          cmds << 'hack/verify-dist.sh'
+          cmds << 'grunt test'    
+          cmds << 'hack/test-integration-headless.sh'
+          cmd = cmds.join(' ')
+          env[:test_exit_code] = run_tests(env, cmds, @options[:root])
+
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

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

@@ -67,8 +67,6 @@ popd >/dev/null
           @options.delete :logs
 
           cmd_env = []
-          cmd_env << 'TEST_ASSETS=true'
-          cmd_env << 'TEST_ASSETS_HEADLESS=true'
           if @options[:skip_image_cleanup]
             cmd_env << 'SKIP_IMAGE_CLEANUP=1'
           end
@@ -124,12 +122,6 @@ popd >/dev/null
             env[:test_exit_code] = run_tests(env, cmds, @options[:root])
           end
 
-          # any other tests that should not be run as sudo
-          if env[:test_exit_code] == 0 && @options[:all]
-            cmds = ['hack/test-assets.sh']
-            env[:test_exit_code] = run_tests(env, cmds, @options[:root])
-          end
-
           @app.call(env)
         end
 

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

@@ -0,0 +1,49 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class DownloadArtifactsOriginConsole < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "download the origin-web-console test artifacts"
+        end
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant download-artifacts-origin-console [machine-name]"
+            o.separator ""
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.download_origin_console_artifacts(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class RepoSyncOriginConsole < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "syncs your local repos to the current instance"
+        end
+
+        def execute
+          options = {}
+          options[:images] = true
+          options[:build] = true
+          options[:clean] = false
+          options[:source] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant sync-origin-console [vm-name]"
+            o.separator ""
+
+            o.on("-c", "--clean", "Delete existing repo before syncing") do |f|
+              options[:clean] = f
+            end
+
+            o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
+              options[:source] = f
+            end
+
+            o.on("--dont-install", "Don't build and install updated source") do |f|
+              options[:build] = false
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.repo_sync_origin_console(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+require_relative "../action"
+
+module Vagrant
+  module Openshift
+    module Commands
+      class TestOriginConsole < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "run the origin web console tests"
+        end
+
+        def execute
+          options = {}
+          options[:download] = false
+          options[:all] = false
+          options[:extended_test_packages] = ""
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant test-origin-console [machine-name]"
+            o.separator ""
+
+            o.on("-d","--artifacts", String, "Download logs and screenshots") do |f|
+              options[:download] = true
+            end
+
+            o.on("", "--env ENV=VALUE", String, "Environment variable to execute tests with") do |f|
+              options[:envs] = [] unless options[:envs]
+              options[:envs] << f
+            end
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.run_origin_asset_tests(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/constants.rb

@@ -30,7 +30,14 @@ module Vagrant
       def self.openshift_repos
         {
           'origin' => 'https://github.com/openshift/origin.git',
-          'source-to-image' => 'https://github.com/openshift/source-to-image.git'
+          'source-to-image' => 'https://github.com/openshift/source-to-image.git',
+          'origin-web-console' => 'https://github.com/openshift/origin-web-console.git'          
+        }
+      end
+
+      def self.console_repos
+        {
+          'origin-web-console' => 'https://github.com/openshift/origin-web-console.git'
         }
       end
 
@@ -44,6 +51,7 @@ module Vagrant
         {
           'origin' => openshift_repos,
           nil => openshift_repos,
+          'origin-console' => console_repos,
           'origin-aggregated-logging' => aggregated_logging_repos
         }[reponame]
       end

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

@@ -60,7 +60,7 @@ module Vagrant
             Timeout::timeout(options[:timeout]) do
               if options[:sudo]
                 rc = machine.communicate.sudo(command, nil, &execute)
-              else 
+              else
                 rc = machine.communicate.execute(command, nil, &execute)
               end
             end
@@ -162,7 +162,7 @@ echo 'Cloning #{repo} ...'
             user_repo_url="git@github.com:#{@options[:user]}/#{repo}"
             command += %{
 echo 'Cloning #{user_repo_url}'
-git clone --quiet #{user_repo_url}
+git clone --quiet --recurse-submodules #{user_repo_url}
 if [ $? -eq 0 ]; then
 cloned=true
 (cd #{repo} && git remote add upstream #{url} && git fetch upstream)
@@ -173,7 +173,7 @@ fi
 
           end
           command += %{
-[ $cloned != true ] && git clone --quiet #{url}
+[ $cloned != true ] && git clone --quiet --recurse-submodules #{url}
 ( cd #{repo} && git checkout #{@options[:branch]} &>/dev/null)
 }
         end

data/lib/vagrant-openshift/plugin.rb

@@ -37,6 +37,11 @@ module Vagrant
         Commands::RepoSyncOrigin
       end
 
+      command "sync-origin-console" do
+        require_relative "command/repo_sync_origin_console"
+        Commands::RepoSyncOriginConsole
+      end
+
       command "sync-sti" do
         require_relative "command/repo_sync_sti"
         Commands::RepoSyncSti
@@ -122,6 +127,11 @@ module Vagrant
         Commands::TestOrigin
       end
 
+      command "test-origin-console" do
+        require_relative "command/test_origin_console"
+        Commands::TestOriginConsole
+      end      
+
       command "test-sti" do
         require_relative "command/test_sti"
         Commands::TestSti
@@ -137,6 +147,11 @@ module Vagrant
         Commands::DownloadArtifactsOrigin
       end
 
+      command "download-artifacts-origin-console" do
+        require_relative "command/download_artifacts_origin_console"
+        Commands::DownloadArtifactsOriginConsole
+      end      
+
       command "download-artifacts-origin-aggregated-logging" do
         require_relative "command/download_artifacts_origin_aggregated_logging"
         Commands::DownloadArtifactsOriginAggregatedLogging

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "3.0.7"
+    VERSION = "3.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,6 +139,7 @@ files:
 - lib/vagrant-openshift/action/create_yum_repositories.rb
 - lib/vagrant-openshift/action/download_artifacts_origin.rb
 - lib/vagrant-openshift/action/download_artifacts_origin_aggregated_logging.rb
+- lib/vagrant-openshift/action/download_artifacts_origin_console.rb
 - lib/vagrant-openshift/action/download_artifacts_sti.rb
 - lib/vagrant-openshift/action/generate_template.rb
 - lib/vagrant-openshift/action/install_origin.rb
@@ -152,6 +153,7 @@ files:
 - lib/vagrant-openshift/action/push_openshift_images.rb
 - lib/vagrant-openshift/action/push_openshift_release.rb
 - lib/vagrant-openshift/action/run_origin_aggregated_logging_tests.rb
+- lib/vagrant-openshift/action/run_origin_asset_tests.rb
 - lib/vagrant-openshift/action/run_origin_tests.rb
 - lib/vagrant-openshift/action/run_sti_tests.rb
 - lib/vagrant-openshift/action/run_systemctl.rb
@@ -173,6 +175,7 @@ files:
 - lib/vagrant-openshift/command/create_local_yum_repo.rb
 - lib/vagrant-openshift/command/download_artifacts_origin.rb
 - lib/vagrant-openshift/command/download_artifacts_origin_aggregated_logging.rb
+- lib/vagrant-openshift/command/download_artifacts_origin_console.rb
 - lib/vagrant-openshift/command/download_artifacts_sti.rb
 - lib/vagrant-openshift/command/install_origin.rb
 - lib/vagrant-openshift/command/install_origin_assets_base.rb
@@ -184,9 +187,11 @@ files:
 - lib/vagrant-openshift/command/push_openshift_release.rb
 - lib/vagrant-openshift/command/repo_sync_origin.rb
 - lib/vagrant-openshift/command/repo_sync_origin_aggregated_logging.rb
+- lib/vagrant-openshift/command/repo_sync_origin_console.rb
 - lib/vagrant-openshift/command/repo_sync_sti.rb
 - lib/vagrant-openshift/command/test_origin.rb
 - lib/vagrant-openshift/command/test_origin_aggregated_logging.rb
+- lib/vagrant-openshift/command/test_origin_console.rb
 - lib/vagrant-openshift/command/test_origin_image.rb
 - lib/vagrant-openshift/command/test_sti.rb
 - lib/vagrant-openshift/command/try_restart_origin.rb