vagrant-openshift 2.0.10 → 3.0.0

data/lib/vagrant-openshift/command/{repo_sync_openshift.rb → repo_sync_origin.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class RepoSyncOpenshift < Vagrant.plugin(2, :command)
+      class RepoSyncOrigin < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -33,7 +33,7 @@ module Vagrant
           options[:source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant sync-openshift [vm-name]"
+            o.banner = "Usage: vagrant sync-origin [vm-name]"
             o.separator ""
 
             o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
@@ -59,7 +59,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.repo_sync_openshift(options)
+            actions = Vagrant::Openshift::Action.repo_sync_origin(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{test_openshift.rb → test_origin.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class TestOpenshift < Vagrant.plugin(2, :command)
+      class TestOrigin < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "run the openshift tests"
+          "run the origin tests"
         end
 
         def execute
@@ -32,13 +32,17 @@ module Vagrant
           options[:extended_test_packages] = ""
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant test-openshift [machine-name]"
+            o.banner = "Usage: vagrant test-origin [machine-name]"
             o.separator ""
 
             o.on("-a", "--all", String, "Run all tests") do |f|
               options[:all] = true
             end
 
+            o.on("", "--skip-check", String, "Skip unit, integration and e2e tests") do |f|
+              options[:skip_check] = true
+            end
+
             o.on("-e", "--extended TEST_BUCKETS", String, "Comma delimited list of extended test packages to run") do |f|
               options[:extended_test_packages] = f
             end
@@ -54,6 +58,10 @@ module Vagrant
             o.on("-c","--report-coverage", String, "Generate code coverage report") do |f|
               options[:report_coverage] = true
             end
+
+            o.on("-j","--parallel", String, "Run parallel make") do |f|
+              options[:parallel] = true
+            end
           end
 
           # Parse the options
@@ -61,7 +69,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.run_openshift_tests(options)
+            actions = Vagrant::Openshift::Action.run_origin_tests(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{test_openshift_image.rb → test_origin_image.rb}

@@ -19,7 +19,7 @@ module Vagrant
   module Openshift
     module Commands
 
-      class TestOpenshiftImage < Vagrant.plugin(2, :command)
+      class TestOriginImage < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -35,7 +35,7 @@ module Vagrant
           options[:registry] = ""
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant test-openshift-image --image IMAGE [vm-name]"
+            o.banner = "Usage: vagrant test-origin-image --image IMAGE [vm-name]"
             o.separator ""
 
             o.on("-i", "--image IMAGE", String, "image to test") do |o|

data/lib/vagrant-openshift/command/{try_restart_openshift.rb → try_restart_origin.rb}

@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class TryRestartOpenshift < Vagrant.plugin(2, :command)
+      class TryRestartOrigin < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "restarts openshift if it's already running"
+          "restarts origin if it's already running"
         end
 
         def execute
@@ -30,7 +30,7 @@ module Vagrant
           options[:clean] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant try-restart-openshift [vm-name]"
+            o.banner = "Usage: vagrant try-restart-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.try_restart_openshift(options)
+            actions = Vagrant::Openshift::Action.try_restart_origin(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/plugin.rb

@@ -32,9 +32,9 @@ module Vagrant
         Config
       end
 
-      command "sync-openshift" do
-        require_relative "command/repo_sync_openshift"
-        Commands::RepoSyncOpenshift
+      command "sync-origin" do
+        require_relative "command/repo_sync_origin"
+        Commands::RepoSyncOrigin
       end
 
       command "sync-sti" do
@@ -47,14 +47,14 @@ module Vagrant
         Commands::BuildAtomicHost
       end
 
-      command "build-openshift-base" do
-        require_relative "command/build_openshift_base"
-        Commands::BuildOpenshiftBase
+      command "build-origin-base" do
+        require_relative "command/build_origin_base"
+        Commands::BuildOriginBase
       end
 
-      command "build-openshift" do
-        require_relative "command/build_openshift"
-        Commands::BuildOpenshift
+      command "build-origin" do
+        require_relative "command/build_origin"
+        Commands::BuildOrigin
       end
 
       command "build-sti" do
@@ -62,24 +62,24 @@ module Vagrant
         Commands::BuildSti
       end
 
-      command "install-openshift" do
-        require_relative "command/install_openshift"
-        Commands::InstallOpenshift
+      command "install-origin" do
+        require_relative "command/install_origin"
+        Commands::InstallOrigin
       end
 
-      command "install-openshift-assets-base" do
-        require_relative "command/install_openshift_assets_base"
-        Commands::InstallOpenshiftAssetsBase
+      command "install-origin-assets-base" do
+        require_relative "command/install_origin_assets_base"
+        Commands::InstallOriginAssetsBase
       end
 
-      command "try-restart-openshift" do
-        require_relative "command/try_restart_openshift"
-        Commands::TryRestartOpenshift
+      command "try-restart-origin" do
+        require_relative "command/try_restart_origin"
+        Commands::TryRestartOrigin
       end
 
-      command "build-openshift-base-images" do
-        require_relative "command/build_openshift_base_images"
-        Commands::BuildOpenshiftBaseImages
+      command "build-origin-base-images" do
+        require_relative "command/build_origin_base_images"
+        Commands::BuildOriginBaseImages
       end
 
       command "push-openshift-images" do
@@ -92,9 +92,9 @@ module Vagrant
         Commands::OriginInit
       end
 
-      command "openshift-local-checkout" do
-        require_relative "command/local_openshift_setup"
-        Commands::LocalOpenshiftSetup
+      command "origin-local-checkout" do
+        require_relative "command/local_origin_setup"
+        Commands::LocalOriginSetup
       end
 
       command "push-openshift-release" do
@@ -102,9 +102,9 @@ module Vagrant
         Commands::PushOpenshiftRelease
       end
 
-      command "test-openshift" do
-        require_relative "command/test_openshift"
-        Commands::TestOpenshift
+      command "test-origin" do
+        require_relative "command/test_origin"
+        Commands::TestOrigin
       end
 
       command "test-sti" do
@@ -112,6 +112,16 @@ module Vagrant
         Commands::TestSti
       end
 
+      command "download-artifacts-origin" do
+        require_relative "command/download_artifacts_origin"
+        Commands::DownloadArtifactsOrigin
+      end
+
+      command "download-artifacts-sti" do
+        require_relative "command/download_artifacts_sti"
+        Commands::DownloadArtifactsSti
+      end
+
       command "create-ami" do
         require_relative "command/create_ami"
         Commands::CreateAMI
@@ -137,14 +147,9 @@ module Vagrant
         Commands::CheckoutRepositories
       end
 
-      command "test-openshift-image" do
-        require_relative "command/test_openshift_image"
-        Commands::TestOpenshiftImage
-      end
-
-      command "bootstrap-openshift" do
-        require_relative 'command/bootstrap_openshift'
-        Commands::BootstrapOpenshift
+      command "test-origin-image" do
+        require_relative "command/test_origin_image"
+        Commands::TestOriginImage
       end
 
       provisioner(:openshift) do

data/lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml

@@ -51,20 +51,6 @@
     :openstack:
       :image: <CentOS 7>
       :ssh_user: centos
-  :bootstrap:
-    :virtualbox:
-      :box_name: centos7_bootstrap
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_virtualbox_bootstrap.box
-    :libvirt:
-      :box_name: centos7_bootstrap
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_libvirt_bootstrap.box
-    :aws:
-      :ami: <AMI_ID>
-      :ami_region: us-east-1
-      :ssh_user: centos
-      :machine_name: <AMI_NAME>
-      :ebs_volume_size: 25
-      :ami_tag_prefix: devenv-centos7-bootstrap_
 :fedora:
   :os:
     :virtualbox:
@@ -117,20 +103,6 @@
     :libvirt:
       :box_name: fedora_inst
       :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_libvirt_inst.box
-  :bootstrap:
-    :virtualbox:
-      :box_name: fedora_bootstrap
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_virtualbox_bootstrap.box
-    :aws:
-      :ami: <AMI_ID>
-      :ami_region: us-east-1
-      :ssh_user: fedora
-      :machine_name: <AMI_NAME>
-      :ebs_volume_size: 25
-      :ami_tag_prefix: devenv-fedora-bootstrap_
-    :libvirt:
-      :box_name: fedora_bootstrap
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_libvirt_bootstrap.box
 :rhel7:
   :os:
     :aws:
@@ -165,14 +137,37 @@
     :openstack:
       :image: <RHEL 7>
       :ssh_user: root
-  :bootstrap:
+:rhel7next:
+  :os:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: ec2-user
+      :machine_name: openshift-rhel7next
+      :ebs_volume_size: 25
+      :ami_tag_prefix: openshift-rhel7next_
+    :openstack:
+      :image: <RHEL 7>
+      :ssh_user: root
+  :deps:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: ec2-user
+      :machine_name: devenv-rhel7next-base
+      :ebs_volume_size: 25
+      :ami_tag_prefix: devenv-rhel7next-base_
+    :openstack:
+      :image: <RHEL 7>
+      :ssh_user: root
+  :inst:
     :aws:
       :ami: <AMI_ID>
       :ami_region: us-east-1
       :ssh_user: ec2-user
       :machine_name: <AMI_NAME>
       :ebs_volume_size: 25
-      :ami_tag_prefix: devenv-rhel7-bootstrap_
+      :ami_tag_prefix: devenv-rhel7next_
     :openstack:
       :image: <RHEL 7>
       :ssh_user: root
@@ -213,15 +208,3 @@
       :image: <ATOMIC>
       :flavor: m1.small
       :ssh_user: root
-  :bootstrap:
-    :aws:
-      :ami: <AMI_ID>
-      :ami_region: us-east-1
-      :ssh_user: cloud-user
-      :machine_name: <AMI_NAME>
-      :ebs_volume_size: 25
-      :ami_tag_prefix: devenv-rhelatomic7-bootstrap_
-    :openstack:
-      :image: <ATOMIC>
-      :flavor: m1.small
-      :ssh_user: root

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.10"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 3.0.0
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,8 +123,8 @@ files:
 - lib/vagrant-openshift.rb
 - lib/vagrant-openshift/action.rb
 - lib/vagrant-openshift/action/atomic_host_upgrade.rb
-- lib/vagrant-openshift/action/build_openshift.rb
-- lib/vagrant-openshift/action/build_openshift_base_images.rb
+- lib/vagrant-openshift/action/build_origin.rb
+- lib/vagrant-openshift/action/build_origin_base_images.rb
 - lib/vagrant-openshift/action/build_sti.rb
 - lib/vagrant-openshift/action/checkout_repositories.rb
 - lib/vagrant-openshift/action/clean.rb
@@ -133,20 +133,20 @@ files:
 - lib/vagrant-openshift/action/create_ami.rb
 - lib/vagrant-openshift/action/create_bare_repo_placeholders.rb
 - lib/vagrant-openshift/action/create_yum_repositories.rb
-- lib/vagrant-openshift/action/download_artifacts_openshift.rb
+- lib/vagrant-openshift/action/download_artifacts_origin.rb
 - lib/vagrant-openshift/action/download_artifacts_sti.rb
 - lib/vagrant-openshift/action/generate_template.rb
-- lib/vagrant-openshift/action/install_openshift.rb
-- lib/vagrant-openshift/action/install_openshift_asset_dependencies.rb
-- lib/vagrant-openshift/action/install_openshift_base_dependencies.rb
-- lib/vagrant-openshift/action/install_openshift_rhel7.rb
-- lib/vagrant-openshift/action/local_openshift_checkout.rb
+- lib/vagrant-openshift/action/install_origin.rb
+- lib/vagrant-openshift/action/install_origin_asset_dependencies.rb
+- lib/vagrant-openshift/action/install_origin_base_dependencies.rb
+- lib/vagrant-openshift/action/install_origin_rhel7.rb
+- lib/vagrant-openshift/action/local_origin_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_openshift_images.rb
 - lib/vagrant-openshift/action/push_openshift_release.rb
-- lib/vagrant-openshift/action/run_openshift_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
 - lib/vagrant-openshift/action/set_host_name.rb
@@ -154,29 +154,30 @@ files:
 - lib/vagrant-openshift/action/sync_upstream_repository.rb
 - lib/vagrant-openshift/action/test_exit_code.rb
 - lib/vagrant-openshift/action/yum_update.rb
-- lib/vagrant-openshift/command/bootstrap_openshift.rb
 - lib/vagrant-openshift/command/build_atomic_host.rb
-- lib/vagrant-openshift/command/build_openshift.rb
-- lib/vagrant-openshift/command/build_openshift_base.rb
-- lib/vagrant-openshift/command/build_openshift_base_images.rb
+- lib/vagrant-openshift/command/build_origin.rb
+- lib/vagrant-openshift/command/build_origin_base.rb
+- lib/vagrant-openshift/command/build_origin_base_images.rb
 - lib/vagrant-openshift/command/build_sti.rb
 - lib/vagrant-openshift/command/checkout_repositories.rb
 - lib/vagrant-openshift/command/clone_upstream_repositories.rb
 - lib/vagrant-openshift/command/create_ami.rb
-- lib/vagrant-openshift/command/install_openshift.rb
-- lib/vagrant-openshift/command/install_openshift_assets_base.rb
-- lib/vagrant-openshift/command/local_openshift_setup.rb
+- lib/vagrant-openshift/command/download_artifacts_origin.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
+- lib/vagrant-openshift/command/local_origin_setup.rb
 - lib/vagrant-openshift/command/modify_ami.rb
 - lib/vagrant-openshift/command/modify_instance.rb
 - lib/vagrant-openshift/command/origin_init.rb
 - lib/vagrant-openshift/command/push_openshift_images.rb
 - lib/vagrant-openshift/command/push_openshift_release.rb
-- lib/vagrant-openshift/command/repo_sync_openshift.rb
+- lib/vagrant-openshift/command/repo_sync_origin.rb
 - lib/vagrant-openshift/command/repo_sync_sti.rb
-- lib/vagrant-openshift/command/test_openshift.rb
-- lib/vagrant-openshift/command/test_openshift_image.rb
+- lib/vagrant-openshift/command/test_origin.rb
+- lib/vagrant-openshift/command/test_origin_image.rb
 - lib/vagrant-openshift/command/test_sti.rb
-- lib/vagrant-openshift/command/try_restart_openshift.rb
+- lib/vagrant-openshift/command/try_restart_origin.rb
 - lib/vagrant-openshift/config.rb
 - lib/vagrant-openshift/constants.rb
 - lib/vagrant-openshift/helper/command_helper.rb