vagrant-openshift 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9073818422c2a2480096ac64ea8bf3238b6d76b6
-  data.tar.gz: 78bd0ccc260b6b0e65ff9f422847385af5f62fbb
+  metadata.gz: a6f50f81d496445d7c7ff530ebbb98b6d1734a8f
+  data.tar.gz: d0601c6912e1dea1acadb9959c3ca2e0e93dad1b
 SHA512:
-  metadata.gz: 8a5a1f99318a659084021fe79fe226f5f677556655e94deffe4f45f37e3e95a06e9718f817f7fcb92284ef35449d280ac06ae0cd8d7edb639a2228ff8156acc5
-  data.tar.gz: 24823bf9a2edc50d3fd53816f3f0c2a36d3ad97f24f86aa5ef5c688d8fd5cbb2e18a486182ac0a12c431dea68f00fde08b3cae63ba8f94a649de0cbe9132cf92
+  metadata.gz: f8f6c74bd4528eebfc10e70c6ab4f1c99a0e052fd8b21075ed2330a404cfa2d7c1303afa86ebb1ef40f7da1e8b77a45ead66e0d774f949e4b6156cc917d2b2da
+  data.tar.gz: a87ed5e5469411c4026f5bb8cd4bdad123069b550fc234545d6a778f1a2c1fa50866dc6aa5c328bc84a7f6de180ab0f2d32c3ca5d72024673d547f826028579e

data/README.asciidoc

@@ -1,9 +1,9 @@
 == OpenShift Origin Build Tools
 
-This is a link:http://www.vagrantup.com[Vagrant] 1.2+ plugin that adds vagrant commands and provisioners to
+This is a link:http://www.vagrantup.com[Vagrant] 1.7.2+ plugin that adds vagrant commands and provisioners to
 build and test link:http://openshift.github.io[OpenShift Origin].
 
-NOTE: This plugin requires link:https://www.vagrantup.com/downloads.html[Vagrant 1.2+]
+NOTE: This plugin requires link:https://www.vagrantup.com/downloads.html[Vagrant 1.7.2+]
 
 NOTE: Instructions below generally assume a Linux-like command line and may require modifications for other environments.
 
@@ -199,6 +199,8 @@ a base AMI in your repository's `.vagrant-openshift.json` file under the
 vagrant up --provider=aws
 ----
 
+TIP: Be sure to rerun origin-init for each subsequent run of `vagrant up --provider=aws` to pick up the last built ami.
+
 NOTE: Requires latest link:https://github.com/mitchellh/vagrant-aws[AWS] provider.
 
 NOTE: You can use the link:https://github.com/mikery/vagrant-ami[Vagrant-AMI] plugin to create an AMI from a running AWS machine.

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

@@ -40,6 +40,7 @@ module Vagrant
             "/tmp/origin/e2e/"                     => artifacts_dir + "e2e/",
 
             "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
+            "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/",
           }
 
           download_map.each do |source,target|

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

@@ -36,7 +36,8 @@ module Vagrant
           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"
+            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log",
+            "/tmp/sti/"                            => artifacts_dir + "sti/"
           }
 
           download_map.each do |source,target|

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

@@ -45,6 +45,10 @@ export PATH=$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/local/go/bin/:$GO
 export KUBECONFIG=/openshift.local.certificates/admin/.kubeconfig
 DELIM
 
+cat > /etc/sysconfig/openshift <<DELIM
+GOPATH=/data
+DELIM
+
 source /etc/profile.d/openshift.sh
 
 pushd $ORIGIN_PATH
@@ -74,7 +78,7 @@ Documentation=https://github.com/openshift/origin
 
 [Service]
 Type=simple
-EnvironmentFile=-/etc/profile.d/openshift.sh
+EnvironmentFile=-/etc/sysconfig/openshift
 ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://\\${HOST}:8443
 ExecStartPost=/bin/sleep 8
 ExecStartPost=/bin/chmod a+r -R /openshift.local.certificates/admin

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

@@ -30,7 +30,7 @@ module Vagrant
           # 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 screen")
+          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 screen java-1.?.0-openjdk")
           sudo(env[:machine], "yum install -y facter", {fail_on_error: false})
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
@@ -67,6 +67,7 @@ systemctl enable docker
 systemctl start docker
 
 docker pull openshift/docker-registry
+docker pull openshift/origin-docker-registry
           }, {:timeout=>60*20})
           @app.call(env)
         end

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

@@ -0,0 +1,54 @@
+#--
+# Copyright 2014 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 InstallOpenshift3Router
+        include CommandHelper
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          puts 'Installing router'
+          sudo(env[:machine], '
+ROUTER_EXISTS=$(openshift ex router 2>&1 | grep "does not exist")
+OS_RUNNING=$(systemctl status openshift | grep "(running)")
+CMD="openshift ex router --create --credentials=${KUBECONFIG}"
+
+if [[ $OS_RUNNING ]]; then
+  if [[ -n $ROUTER_EXISTS ]]; then
+    echo "Installing OpenShift router"
+    ${CMD}
+  else
+    echo "Router already exists, skipping"
+  fi
+else
+  echo "The OpenShift process is not running.  To install a router please start OpenShift and run ${CMD}"
+fi
+
+
+')
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,132 @@
+#
+# 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 PushOpenshift3Images
+        include CommandHelper
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options
+        end
+
+        # FIXME: This is a temporary fix as the RHEL7 AMI should have this
+        #        registry here already.
+        def fix_insecure_registry_cmd(registry_url)
+          %{
+cat <<EOF > /etc/sysconfig/docker
+OPTIONS='--insecure-registry #{registry_url} --selinux-enabled -H fd://'
+EOF
+systemctl restart docker
+          }
+        end
+
+        def build_image(image_name, git_ref, repo_url, registry)
+          %{
+dest_dir="/data/src/github/openshift/#{image_name}"
+rm -rf ${dest_dir}; mkdir -p ${dest_dir}
+if git clone #{repo_url} ${dest_dir}; then
+  pushd ${dest_dir}
+    git checkout #{git_ref}
+    git_ref=$(git rev-parse --short HEAD)
+    echo "Building #{image_name}:$git_ref"
+
+    if make build TARGET=centos7; then
+      docker tag #{image_name}-centos7 #{registry}#{image_name}-centos7:$git_ref
+      docker tag #{image_name}-centos7 #{registry}#{image_name}-centos7:latest
+      docker tag #{image_name}-centos7 #{image_name}-centos7:latest
+      docker push #{registry}#{image_name}-centos7:$git_ref
+      docker push #{registry}#{image_name}-centos7:latest
+      docker push #{image_name}-centos7:latest
+    else
+      echo "ERROR: Failed to build #{image_name}-centos7"
+    fi
+
+    if make build TARGET=rhel7; then
+      docker tag #{image_name}-rhel7 #{registry}#{image_name}-rhel7:$git_ref
+      docker tag #{image_name}-rhel7 #{registry}#{image_name}-rhel7:latest
+      docker push #{registry}#{image_name}-rhel7:$git_ref
+      docker push #{registry}#{image_name}-rhel7:latest
+    else
+      echo "ERROR: Failed to build #{image_name}-rhel7"
+    fi
+  popd
+fi
+          }
+        end
+
+        def update_latest_image_cmd(registry)
+          cmd = %{
+rm -rf ~/latest_images ; touch ~/latest_images
+          }
+          Vagrant::Openshift::Constants.openshift3_images.each do |name, git_url|
+            cmd += %{
+git_ref=$(git ls-remote #{git_url} -h refs/heads/master | cut -c1-7)
+curl -s http://#{registry}v1/repositories/#{name}-rhel7/tags/${git_ref} | grep -q "error"
+if [[ "$?" != "0" ]]; then
+  echo "#{name};$git_ref" >> ~/latest_images
+fi
+            }
+          end
+          return cmd
+        end
+
+        def call(env)
+          cmd = fix_insecure_registry_cmd(@options[:registry])
+          if !@options[:registry].end_with?('/')
+            @options[:registry] += "/"
+          end
+
+          cmd += %{
+set -x; set +e
+echo "Pre-pulling base images"
+docker pull #{@options[:registry]}openshift/base-centos7
+[[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-centos7 openshift/base-centos7
+docker pull #{@options[:registry]}openshift/base-rhel7
+[[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-rhel7 openshift/base-rhel7
+          }
+
+          # FIXME: We always need to make sure we have the latest base image
+          # FIXME: This is because the internal registry is pruned once per month
+          if !@options[:build_images].include?("openshift/base")
+            @options[:build_images] = "openshift/base:master,#{@options[:build_images]}"
+          end
+
+          build_images = @options[:build_images].split(",").map { |i| i.strip }
+
+          build_images.each do |image|
+            name, git_ref = image.split(':')
+            repo_url = Vagrant::Openshift::Constants.openshift3_images[name]
+            if repo_url == nil
+              puts "Unregistred image: #{name}, skipping"
+              next
+            end
+            cmd += build_image(name, git_ref, repo_url, @options[:registry])
+          end
+
+          cmd += update_latest_image_cmd(@options[:registry])
+
+          do_execute(env[:machine], cmd)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -55,26 +55,42 @@ popd >/dev/null
           exit_code
         end
 
+        #
+        # Build and run the make commands
+        #   for testing all run make test
+        #   for testing unit tests only run make build check
+        #   for testing assets run hack/test-assets.sh
+        #
+        # All env vars will be added to the beginning of the command like VAR=1 make test
+        #
         def call(env)
           @options.delete :logs
 
-          if @options[:report_coverage]
-            cmds = ['OUTPUT_COVERAGE=/tmp/origin/e2e/artifacts/coverage hack/test-go.sh']
-          else
-            cmds = ['hack/test-go.sh']
-          end
+          cmd_env = []
+          build_targets = ["make"]
 
           if @options[:all]
-            cmds << 'hack/test-integration.sh'
-            cmds << 'hack/test-cmd.sh'
+            cmd_env << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts'
+            cmd_env << 'LOG_DIR=/tmp/origin/e2e/logs'
+            cmd_env << 'TEST_ASSETS=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
+            build_targets << "SKIP_BUILD=true"
+
             if @options[:skip_image_cleanup]
-              cmds << 'SKIP_IMAGE_CLEANUP=1 ARTIFACT_DIR=/tmp/origin/e2e/artifacts LOG_DIR=/tmp/origin/e2e/logs hack/test-end-to-end.sh'
-            else
-              cmds << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts LOG_DIR=/tmp/origin/e2e/logs hack/test-end-to-end.sh'
+              cmd_env << 'SKIP_IMAGE_CLEANUP=1'
             end
+          else
+            build_targets << "check"
+          end
+
+          if @options[:report_coverage]
+            cmd_env << 'OUTPUT_COVERAGE=/tmp/origin/e2e/artifacts/coverage'
           end
 
-          env[:test_exit_code] = run_tests(env, cmds, true)
+          cmd = cmd_env.join(' ') + ' ' + build_targets.join(' ')
+          env[:test_exit_code] = run_tests(env, [cmd], true)
 
           # any other tests that should not be run as sudo
           if env[:test_exit_code] == 0 && @options[:all]

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

@@ -31,7 +31,7 @@ module Vagrant
         def call(env)
           @options.delete :logs
 
-          cmds = ['hack/test-go.sh']
+          cmds = ['OUTPUT_COVERAGE=/tmp/sti/artifacts/coverage hack/test-go.sh']
 
           if @options[:all]
             cmds << 'STI_TIMEOUT="--timeout 240s" hack/test-integration.sh'

data/lib/vagrant-openshift/action/{try_restart_openshift3.rb → run_systemctl.rb}

@@ -17,20 +17,21 @@
 module Vagrant
   module Openshift
     module Action
-      class TryRestartOpenshift3
+      class RunSystemctl
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options)
           @app = app
           @env = env
+          @options = options
         end
 
         def call(env)
-          sudo(env[:machine], "systemctl try-restart openshift")
-
-          @app.call(env)
+          unless @options[:action].nil? || @options[:service].nil?
+            sudo(env[:machine], "systemctl #{@options[:action]} #{@options[:service]}")
+            @app.call(env)
+          end
         end
-
       end
     end
   end

data/lib/vagrant-openshift/action.rb

@@ -40,6 +40,14 @@ module Vagrant
         end
       end
 
+      def self.install_openshift3_router(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use RunSystemctl, {:action => "start", :service => "openshift"}
+          b.use InstallOpenshift3Router
+          b.use RunSystemctl, {:action => "stop", :service => "openshift"}
+        end
+      end
+
       def self.install_openshift3_assets_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use InstallOpenshift3AssetDependencies
@@ -52,6 +60,12 @@ module Vagrant
         end
       end
 
+      def self.push_openshift3_images(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use PushOpenshift3Images, options
+        end
+      end
+
       def self.build_sti(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use BuildSti, options
@@ -60,7 +74,7 @@ module Vagrant
 
       def self.try_restart_openshift3(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use TryRestartOpenshift3
+          b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
         end
       end
 
@@ -85,7 +99,7 @@ module Vagrant
           if options[:build]
             b.use(BuildOpenshift3BaseImages, options) if options[:images]
             b.use(BuildOpenshift3, options)
-            b.use(TryRestartOpenshift3)
+            b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
           end
         end
       end
@@ -201,12 +215,12 @@ module Vagrant
       autoload :InstallOpenshift3BaseDependencies, action_root.join("install_openshift3_base_dependencies")
       autoload :InstallOpenshift3AssetDependencies, action_root.join("install_openshift3_asset_dependencies")
       autoload :BuildOpenshift3BaseImages, action_root.join("build_openshift3_base_images")
+      autoload :PushOpenshift3Images, action_root.join("push_openshift3_images")
       autoload :PushOpenshift3Release, action_root.join("push_openshift3_release")
       autoload :InstallOpenshift3, action_root.join("install_openshift3")
       autoload :InstallOpenshift3Rhel7, action_root.join("install_openshift3_rhel7")
       autoload :BuildOpenshift3, action_root.join("build_openshift3")
       autoload :BuildSti, action_root.join("build_sti")
-      autoload :TryRestartOpenshift3, action_root.join("try_restart_openshift3")
       autoload :PrepareSshConfig, action_root.join("prepare_ssh_config")
       autoload :SyncLocalRepository, action_root.join("sync_local_repository")
       autoload :SyncUpstreamRepository, action_root.join("sync_upstream_repository")
@@ -223,6 +237,8 @@ module Vagrant
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
       autoload :SetupBindHost, action_root.join("setup_bind_host")
+      autoload :InstallOpenshift3Router, action_root.join("install_openshift3_router")
+      autoload :RunSystemctl, action_root.join("run_systemctl")
     end
   end
 end

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

@@ -0,0 +1,51 @@
+#--
+# 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 InstallOpenshift3Router < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "installs openshift3 router"
+        end
+
+        def execute
+          options = {}
+          options[:clean] = false
+          options[:local_source] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant install-openshift3-router [vm-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.install_openshift3_router(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+#--
+# 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 PushOpenshift3Images < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "build and push openshift v3 images"
+        end
+
+        def execute
+          options = {}
+          options[:registry] = nil
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant push-openshift3-images --registry DOCKER_REGISTRY [vm-name]"
+            o.on("--registry [url]", String, "Docker Registry to push images to.") do |c|
+              options[:registry] = c
+            end
+            o.on("--build_images [list]", String, "List of IMAGE:REF pairs, delimited by ','") do |i|
+              options[:build_images] = i
+            end
+            o.separator ""
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          if options[:registry].nil?
+            @env.ui.warn "You must specify target Docker registry"
+            exit
+          end
+
+          if options[:build_images].nil?
+            @env.ui.warn "You must specify list of images to build"
+            exit
+          end
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.push_openshift3_images(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -46,7 +46,7 @@ module Vagrant
               options[:skip_image_cleanup] = true
             end
 
-            o.on("-c","--report-coverage", String, "Generate code coverage report in Jenkins") do |f|
+            o.on("-c","--report-coverage", String, "Generate code coverage report") do |f|
               options[:report_coverage] = true
             end
           end

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

@@ -30,7 +30,10 @@ module Vagrant
           options = {}
           options[:image] = nil
           options[:ref] = 'master'
+          options[:image_version] = ""
           options[:source] = nil
+          options[:base_images] = false
+          options[:registry] = ""
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant test-openshift3-image --image IMAGE [vm-name]"
@@ -44,9 +47,23 @@ module Vagrant
               options[:ref] = o
             end
 
+            o.on("-m", "--image_version VERSION", String, "version of the software") do |o|
+              options[:image_version] = o
+            end
+
             o.on("-s", "--source SOURCE", String, "git repo source url") do |o|
               options[:source] = o
             end
+
+            o.on("-b", "--base_images", "flag whether the base images have to be pre-pulled") do
+              options[:base_images] = true
+            end
+
+            # FIXME: This is a temporary fix as the RHEL7 AMI should have this
+            #        registry here already.
+            o.on("--registry [url]", String, "Docker Registry to push images to.") do |o|
+              options[:registry] = o
+            end
           end
 
           # Parse the options
@@ -59,23 +76,37 @@ module Vagrant
           end
 
           if options[:source].nil?
-            options[:source] = "https://github.com/#{options[:image]}"
+            @env.ui.warn "You must specify git repo source url"
+            exit
           end
 
+          options[:source] = "https://github.com/#{options[:source]}"
+
           with_target_vms(argv, :reverse => true) do |machine|
             image = options[:image]
             ref = options[:ref]
+            image_version = options[:image_version]
             source = options[:source]
+            base_images = options[:base_images]
+            registry = options[:registry]
 
-            # image could be centos or openshift/ruby-20-centos
-            # just grab the end (centos or ruby-20-centos)
-            source_dir = File.basename(image)
+            # image could be centos or openshift/ruby-20-centos7
+            # just grab the end (centos or ruby-20-centos7)
+            source_dir = File.basename(source)
             app_name = "test-#{source_dir}"
             rc=1
             begin
               out, err, rc = do_execute(machine, %{
 set -x
 
+# NOTE: This is only for rhel7
+if [ -n "#{registry}" -a -f /etc/sysconfig/docker ]; then
+  cat <<EOF > /etc/sysconfig/docker
+OPTIONS='--insecure-registry #{registry} --selinux-enabled -H fd://'
+EOF
+  systemctl restart docker
+fi
+
 # so we can call sti
 PATH=/data/src/github.com/openshift/source-to-image/_output/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/go/bin:$PATH
 
@@ -91,33 +122,57 @@ cd $temp_dir
 git clone #{source}
 cd #{source_dir}
 
+# Fetch refs from Github pull requests
+git fetch --quiet --tags --progress #{source} +refs/pull/*:refs/remotes/origin/pr/*
+
 # switch to the desired ref
 git checkout #{ref}
 
-# get git sha1
-git_sha1=`git rev-parse --short #{ref}`
+if [ "#{base_images}" == "true" -a -n "#{registry}" ]; then
+  # Pull base images
+  docker pull #{registry}/openshift/base-centos7 && docker tag #{registry}/openshift/base-centos7 openshift/base-centos7
+  docker pull #{registry}/openshift/base-rhel7 && docker tag #{registry}/openshift/base-rhel7 openshift/base-rhel7
+fi
+
+if [ -n "#{image_version}" ]; then
+  BASE_NAME="#{image}-#{image_version}"
+  pushd #{image_version} > /dev/null
+else 
+  BASE_NAME="#{image}"
+fi
+
+IMAGE_NAME="${BASE_NAME}-centos7"
 
-# Build the STI image we use for testing
-docker build -t #{image}-candidate .
+# Build the CentOS7 STI image we use for testing
+docker build -t ${IMAGE_NAME}-candidate .
 status=$?
 
 # Run the STI image test framework
 if [ $status -eq 0 ]; then
-  IMAGE_NAME=#{image}-candidate ./test/run
+  IMAGE_NAME=${IMAGE_NAME}-candidate ./test/run
   status=$?
 fi
 
-if [ $status -eq 0 ]; then
-  # get the image id
-  image_id=`docker inspect --format="{{ .Id }}" #{image}-candidate:latest`
+if [ $status -eq 0 -a -f Dockerfile.rhel7 ]; then
+  mv Dockerfile Dockerfile.centos7
+  mv Dockerfile.rhel7 Dockerfile
+
+  IMAGE_NAME="${BASE_NAME}-rhel7"
 
-  # tag it devenv-ready
-  docker tag $image_id #{image}:devenv-ready
+  # Build the RHEL7 based STI image we use for testing
+  docker build -t ${IMAGE_NAME}-candidate .
+  status=$?
 
-  # tag it with the git ref
-  docker tag $image_id #{image}:git-$git_sha1
+  # Run the STI image test framework
+  if [ $status -eq 0 -a -f Dockerfile.rhel7 ]; then
+    IMAGE_NAME=${IMAGE_NAME}-candidate ./test/run
+    status=$?
+  fi
 fi
 
+# If software version is set, go back to the repository root
+[ -n "#{image_version}" ] && popd > /dev/null
+
 # clean up
 cd /
 rm -rf $temp_dir

data/lib/vagrant-openshift/constants.rb

@@ -27,22 +27,18 @@ module Vagrant
         {
           'origin' => 'https://github.com/openshift/origin.git',
           'source-to-image' => 'https://github.com/openshift/source-to-image.git'
-        }.merge(openshift3_images)
+        }
       end
 
       def self.openshift3_images
         {
-          'wildfly-8-centos' => 'https://github.com/openshift/wildfly-8-centos.git',
-          'ruby-20-centos' => 'https://github.com/openshift/ruby-20-centos.git'
+          'openshift/base'       => 'https://github.com/openshift/sti-base.git',
+          'openshift/ruby-20'    => 'https://github.com/openshift/sti-ruby.git',
+          'openshift/nodejs-010' => 'https://github.com/openshift/sti-nodejs.git',
+          'openshift/mysql-55'   => 'https://github.com/openshift/mysql.git',
         }
       end
 
-      def self.images
-        [
-          'centos'
-        ] + openshift3_images.map { |c, _| "openshift/#{c}" }
-      end
-
       def self.git_branch_current
         "$(git rev-parse --abbrev-ref HEAD)"
       end

data/lib/vagrant-openshift/plugin.rb

@@ -77,6 +77,11 @@ module Vagrant
         Commands::BuildOpenshift3BaseImages
       end
 
+      command "push-openshift3-images" do
+        require_relative "command/push_openshift3_images"
+        Commands::PushOpenshift3Images
+      end
+
       command "origin-init" do
         require_relative "command/openshift_init"
         Commands::OpenshiftInit
@@ -132,6 +137,11 @@ module Vagrant
         Commands::TestOpenshift3Image
       end
 
+      command "install-openshift3-router" do
+        require_relative "command/install_openshift3_router"
+        Commands::InstallOpenshift3Router
+      end
+
       provisioner(:openshift) do
         require_relative "provisioner"
         Provisioner

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "1.0.17"
+    VERSION = "1.0.18"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,20 +140,22 @@ files:
 - lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift3_images.rb
 - lib/vagrant-openshift/action/install_openshift3_rhel7.rb
+- lib/vagrant-openshift/action/install_openshift3_router.rb
 - lib/vagrant-openshift/action/local_openshift3_checkout.rb
 - lib/vagrant-openshift/action/modify_ami.rb
 - lib/vagrant-openshift/action/modify_instance.rb
 - lib/vagrant-openshift/action/prepare_ssh_config.rb
+- lib/vagrant-openshift/action/push_openshift3_images.rb
 - lib/vagrant-openshift/action/push_openshift3_release.rb
 - lib/vagrant-openshift/action/run_openshift3_tests.rb
 - lib/vagrant-openshift/action/run_sti_tests.rb
+- lib/vagrant-openshift/action/run_systemctl.rb
 - lib/vagrant-openshift/action/set_host_name.rb
 - lib/vagrant-openshift/action/setup_bind_dns_key.rb
 - lib/vagrant-openshift/action/setup_bind_host.rb
 - lib/vagrant-openshift/action/sync_local_repository.rb
 - lib/vagrant-openshift/action/sync_upstream_repository.rb
 - lib/vagrant-openshift/action/test_exit_code.rb
-- lib/vagrant-openshift/action/try_restart_openshift3.rb
 - lib/vagrant-openshift/action/yum_update.rb
 - lib/vagrant-openshift/command/build_openshift3.rb
 - lib/vagrant-openshift/command/build_openshift3_base.rb
@@ -164,10 +166,12 @@ files:
 - lib/vagrant-openshift/command/create_ami.rb
 - lib/vagrant-openshift/command/install_openshift3.rb
 - lib/vagrant-openshift/command/install_openshift3_assets_base.rb
+- lib/vagrant-openshift/command/install_openshift3_router.rb
 - lib/vagrant-openshift/command/local_openshift3_setup.rb
 - lib/vagrant-openshift/command/modify_ami.rb
 - lib/vagrant-openshift/command/modify_instance.rb
 - lib/vagrant-openshift/command/openshift_init.rb
+- lib/vagrant-openshift/command/push_openshift3_images.rb
 - lib/vagrant-openshift/command/push_openshift3_release.rb
 - lib/vagrant-openshift/command/repo_sync_openshift3.rb
 - lib/vagrant-openshift/command/repo_sync_sti.rb