vagrant-openshift 2.0.10 → 3.0.0

data/lib/vagrant-openshift/action/{install_openshift_rhel7.rb → install_origin_rhel7.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshiftRhel7
+      class InstallOriginRhel7
         include CommandHelper
         def initialize(app, env)
           @app = app
@@ -47,7 +47,7 @@ rm -rf $contextdir/repos/*chrome*.repo
 
 # create Dockerfile
 cat <<EOF > $contextdir/Dockerfile
-FROM registry.access.redhat.com/rhel7:latest
+FROM registry.access.redhat.com/rhel7.1:latest
 
 RUN yum remove -y subscription-manager
 
@@ -59,9 +59,8 @@ RUN yum update -y && yum clean all
 
 EOF
 
-# make old official image backup and build the new "official"
-docker tag rhel7:latest rhel7:latest_official
 docker build --rm -t rhel7:latest $contextdir
+docker tag rhel7:latest rhel7.1
 
 # cleaning
 rm -rf $contextdir

data/lib/vagrant-openshift/action/{local_openshift_checkout.rb → local_origin_checkout.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class LocalOpenshiftCheckout
+      class LocalOriginCheckout
         include CommandHelper
 
         def initialize(app, env, options)
@@ -43,7 +43,7 @@ module Vagrant
             end
 
             system(commands)
-            puts "OpenShift repositories cloned into #{Dir.pwd}"
+            puts "Origin repositories cloned into #{Dir.pwd}"
           end
 
           @app.call(env)

data/lib/vagrant-openshift/action/{run_openshift_tests.rb → run_origin_tests.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class RunOpenshiftTests
+      class RunOriginTests
         include CommandHelper
 
         @@SSH_TIMEOUT = 4800
@@ -68,6 +68,10 @@ popd >/dev/null
 
           cmd_env = []
           build_targets = ["make"]
+          if @options[:parallel]
+            build_targets << '-j'
+            build_targets << '--output-sync=recurse'
+          end
 
           if @options[:all]
             cmd_env << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts'
@@ -83,7 +87,7 @@ popd >/dev/null
               cmd_env << 'SKIP_IMAGE_CLEANUP=1'
             end
           else
-            build_targets << "check"
+            build_targets << "check" if !@options[:skip_check]
           end
 
           if @options[:report_coverage]
@@ -96,7 +100,7 @@ popd >/dev/null
           if env[:test_exit_code] == 0 && @options[:extended_test_packages].length > 0
             # for extended tests we need a ginkgo binary
             do_execute(env[:machine], "go get github.com/onsi/ginkgo/ginkgo", {:timeout => 60*60*2, :fail_on_error => true, :verbose => false})
-            cmds = @options[:extended_test_packages].split(",").map{ |p| 'test/extended/'+Shellwords.escape(p)+'.sh'}
+            cmds = parse_extended(@options[:extended_test_packages])
             env[:test_exit_code] = run_tests(env, cmds, true)
           end
 
@@ -109,6 +113,26 @@ popd >/dev/null
 
           @app.call(env)
         end
+
+        # parse_extended parses the extended test tag
+        # The valid syntax is:
+        # [test][extended:core] will run **all** test cases in 'core' bucket
+        # [test][extended:core(focus)] will run just test cases that matches 'focus' string in core bucket
+        def parse_extended(tag)
+          buckets = tag.split(",")
+          cmds = []
+          buckets.each do |bucket|
+            if bucket.include?('(')
+              focus = bucket.slice(bucket.index("(")+1..-2).split(" ").map { |i| Shellwords.escape(i.strip) }.join(" ")
+              name = Shellwords.escape(bucket.slice(0..bucket.index("(")-1))
+              cmds << "test/extended/#{name.strip}.sh -focus=\"#{focus}\""
+            else
+              cmds << "test/extended/#{Shellwords.escape(bucket.strip)}.sh"
+            end
+          end
+          return cmds
+        end
+
       end
     end
   end

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

@@ -63,9 +63,14 @@ module Vagrant
               command += "git push -q verifier:#{Constants.build_dir + repo_name}-bare master:master --tags --force;\n"
             end
             command += "git push -q verifier:#{Constants.build_dir + repo_name }-bare #{branch}:master --tags --force"
-            system(command)
-            if $?.exitstatus != 0
-              exit $?.exitstatus
+
+            exit_status = 1
+            retries = 0
+            while exit_status != 0
+              system(command)
+              exit_status = $?.exitstatus
+              exit exit_status if exit_status != 0 && retries >= 2
+              retries += 1
             end
           ensure
             reset_temp_commit

data/lib/vagrant-openshift/command/{build_openshift.rb → build_origin.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshift < Vagrant.plugin(2, :command)
+      class BuildOrigin < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "builds openshift"
+          "builds origin"
         end
 
         def execute
@@ -32,7 +32,7 @@ module Vagrant
           options[:force] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift [vm-name]"
+            o.banner = "Usage: vagrant build-origin [vm-name]"
             o.separator ""
 
             o.on("--images", "Build the images as well as core content.") do |c|
@@ -48,7 +48,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift(options)
+            actions = Vagrant::Openshift::Action.build_origin(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{build_openshift_base.rb → build_origin_base.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshiftBase < Vagrant.plugin(2, :command)
+      class BuildOriginBase < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "install the prereqs for openshift"
+          "install the prereqs for origin"
         end
 
         def execute
@@ -30,7 +30,7 @@ module Vagrant
           options[:clean] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift-base [vm-name]"
+            o.banner = "Usage: vagrant build-origin-base [vm-name]"
             o.separator ""
           end
 
@@ -39,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift_base(options)
+            actions = Vagrant::Openshift::Action.build_origin_base(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{build_openshift_base_images.rb → build_origin_base_images.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshiftBaseImages < Vagrant.plugin(2, :command)
+      class BuildOriginBaseImages < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "builds openshift infrastructure images"
+          "builds origin infrastructure images"
         end
 
         def execute
@@ -30,7 +30,7 @@ module Vagrant
           options[:clean] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift-base-images"
+            o.banner = "Usage: vagrant build-origin-base-images"
             o.separator ""
           end
 
@@ -39,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift_base_images(options)
+            actions = Vagrant::Openshift::Action.build_origin_base_images(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{install_openshift_assets_base.rb → download_artifacts_origin.rb}

@@ -18,18 +18,18 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class InstallOpenshiftAssetsBase < Vagrant.plugin(2, :command)
+      class DownloadArtifactsOrigin < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "installs openshift asset dependencies"
+          "download the origin test artifacts"
         end
 
         def execute
           options = {}
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-openshift-assets-base [vm-name]"
+            o.banner = "Usage: vagrant download-artifacts-origin [machine-name]"
             o.separator ""
           end
 
@@ -38,7 +38,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_openshift_assets_base(options)
+            actions = Vagrant::Openshift::Action.download_origin_artifacts(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/download_artifacts_sti.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 DownloadArtifactsSti < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "download the origin test artifacts"
+        end
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant download-artifacts-sti [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_sti_artifacts(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/{install_openshift.rb → install_origin.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class InstallOpenshift < Vagrant.plugin(2, :command)
+      class InstallOrigin < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "installs openshift"
+          "installs origin"
         end
 
         def execute
@@ -30,7 +30,7 @@ module Vagrant
           options[:clean] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-openshift [vm-name]"
+            o.banner = "Usage: vagrant install-origin [vm-name]"
             o.separator ""
           end
 
@@ -39,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_openshift(options)
+            actions = Vagrant::Openshift::Action.install_origin(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/install_origin_assets_base.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 InstallOriginAssetsBase < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "installs origin asset dependencies"
+        end
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant install-origin-assets-base [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_origin_assets_base(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/{local_openshift_setup.rb → local_origin_setup.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class LocalOpenshiftSetup < Vagrant.plugin(2, :command)
+      class LocalOriginSetup < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "clones the openshift repos into the current directory"
+          "clones the origin repos into the current directory"
         end
 
         def execute
@@ -32,14 +32,14 @@ module Vagrant
           }
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant openshift-local-checkout [options]"
+            o.banner = "Usage: vagrant origin-local-checkout [options]"
             o.separator ""
 
             o.on("-b [branch-name]", "--branch [branch-name]", String, "Check out the specified branch. Default is 'master'.") do |f|
               options[:branch] = f
             end
 
-            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|
+            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 Origin repos.") do |f|
               options[:user] = f
             end
 
@@ -52,7 +52,7 @@ module Vagrant
           argv = parse_options(opts)
           return if !argv
 
-          actions = Vagrant::Openshift::Action.local_openshift_checkout(options)
+          actions = Vagrant::Openshift::Action.local_origin_checkout(options)
           @env.action_runner.run actions
           0
         end

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

@@ -37,18 +37,18 @@ module Vagrant
             :no_insert_key => false
           }
 
-          valid_stage = ['os','deps','inst', 'bootstrap']
-          valid_os = ['centos7','fedora','rhel7','rhelatomic7']
+          valid_stage = ['os','deps','inst']
+          valid_os = ['centos7','fedora','rhel7','rhel7next','rhelatomic7']
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant origin-init [vm or instance name]"
             o.separator ""
 
-            o.on("-s [stage]", "--stage [stage]", String, "Specify what build state to start from:\n\tos = base operating system\n\tdeps = only dependencies installed\n\tinst = dev environment [default]\n\tbootstrap = running environment") do |f|
+            o.on("-s [stage]", "--stage [stage]", String, "Specify what build state to start from:\n\tos = base operating system\n\tdeps = only dependencies installed\n\tinst = dev environment [default]") do |f|
               options[:stage] = f
             end
 
-            o.on("-o [name]", "--os [name]", String, "Operating system:\n\tcentos7 [default]\n\tfedora\n\trhel7\n\trhelatomic7") do |f|
+            o.on("-o [name]", "--os [name]", String, "Operating system:\n\tcentos7 [default]\n\tfedora\n\trhel7\n\trhel7next\n\trhelatomic7") do |f|
               options[:os] = f
             end