vagrant-openshift 3.0.3 → 3.0.4

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

@@ -0,0 +1,56 @@
+#--
+# 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 CreateLocalYumRepo < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "create yum repo from locally generated RPMs"
+        end
+
+        def execute
+          options = {}
+          options[:rpmdir_loc] = nil
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant create-local-yum-repo [vm-name]"
+            o.separator ""
+            
+            o.on("--rpmdir_loc [directory]", String, "Directory where the RPMs exist on the vm.") do |f|
+              options[:rpmdir_loc] = 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.create_local_yum_repo(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

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

@@ -29,6 +29,7 @@ module Vagrant
           options = {
             :branch => 'master',
             :replace => false,
+            :repo => 'origin'
           }
 
           opts = OptionParser.new do |o|
@@ -46,6 +47,10 @@ module Vagrant
             o.on("-r", "--replace", "Delete existing cloned dirs first. Default is to skip repos that are already cloned.") do |f|
               options[:replace] = f
             end
+
+            o.on("", "--repo [reponame]", "Repo to checkout.  Default is 'origin'.") do |f|
+              options[:repo] = f
+            end
           end
 
           # Parse the options

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

@@ -0,0 +1,71 @@
+#--
+# 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 RepoSyncOriginAggregatedLogging < 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
+          options[:repo] = 'origin-aggregated-logging'
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant sync-origin-aggregated-logging [vm-name]"
+            o.separator ""
+
+            o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
+              options[:source] = f
+            end
+
+            o.on("-c", "--clean", "Delete existing repo before syncing source") do |f|
+              options[:clean] = f
+            end
+
+            o.on("--dont-install", "Don't build and install updated source") do |f|
+              options[:build] = false
+            end
+
+            o.on("--no-images", "Don't build updated component Docker images") do |f|
+              options[:images] = 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_aggregated_logging(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -35,6 +35,14 @@ module Vagrant
             o.banner = "Usage: vagrant test-origin [machine-name]"
             o.separator ""
 
+            o.on("-t", "--target MAKEFILE_TARGETS", String, "Arguments to pass to the repository Makefile") do |f|
+              options[:target] = f
+            end
+
+            o.on("", "--root", String, "Run tests as root") do |f|
+              options[:root] = true
+            end
+
             o.on("-a", "--all", String, "Run all tests") do |f|
               options[:all] = true
             end
@@ -63,9 +71,14 @@ module Vagrant
               options[:parallel] = true
             end
 
-            o.on("-r","--image-registry", String, "Image registry to configure tests with") do |f|
+            o.on("-r","--image-registry REGISTRY", String, "Image registry to configure tests with") do |f|
               options[:image_registry] = f
             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

data/lib/vagrant-openshift/command/test_origin_aggregated_logging.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 TestOriginAggregatedLogging < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "run the origin-aggregated-logging tests"
+        end
+
+        def execute
+          options = {}
+          options[:download] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant test-origin-aggregated-logging [machine-name]"
+            o.separator ""
+
+            o.on("", "--root", String, "Run tests as root") do |f|
+              options[:root] = true
+            end
+
+            o.on("-d","--artifacts", String, "Download logs") do |f|
+              options[:download] = true
+            end
+
+            o.on("-r","--image-registry", String, "Image registry to configure tests with") do |f|
+              options[:image_registry] = f
+            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_aggregated_logging_tests(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -91,7 +91,10 @@ module Vagrant
             rc=1
             begin
               out, err, rc = do_execute(machine, %{
-set -x
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
 
 # NOTE: This is only for rhel7
 if [ -n "#{registry}" -a -f /etc/sysconfig/docker ]; then
@@ -129,12 +132,12 @@ if [ "#{base_images}" == "true" -a -n "#{registry}" ]; then
   docker pull #{registry}/openshift/base-rhel7 && docker tag #{registry}/openshift/base-rhel7 openshift/base-rhel7
 fi
 
-if ! sudo env "PATH=$PATH" make test TARGET=rhel7; then
+if ! sudo env "PATH=$PATH" SKIP_SQUASH=1 make test TARGET=rhel7; then
     echo "ERROR: #{image}-rhel7 failed testing."
     exit 1
 fi
 
-if ! sudo env "PATH=$PATH" make test TARGET=centos7; then
+if ! sudo env "PATH=$PATH" SKIP_SQUASH=1 make test TARGET=centos7; then
     echo "ERROR: #{image}-centos7 failed testing."
     exit 1
 fi
@@ -142,7 +145,6 @@ fi
 # clean up
 cd /
 sudo rm -rf $temp_dir
-exit $status
 })
             # Vagrant throws an exception if any execute invocation returns non-zero,
             # so catch it so we can return a proper output.

data/lib/vagrant-openshift/constants.rb

@@ -23,6 +23,10 @@ module Vagrant
         openshift_repos
       end
 
+      def self.logging_repos(env)
+        aggregated_logging_repos
+      end
+
       def self.openshift_repos
         {
           'origin' => 'https://github.com/openshift/origin.git',
@@ -30,7 +34,21 @@ module Vagrant
         }
       end
 
-      def self.git_branch_current
+       def self.aggregated_logging_repos
+        {
+          'origin-aggregated-logging' => 'https://github.com/openshift/origin-aggregated-logging.git'
+        }
+      end
+
+      def self.repos_for_name(reponame)
+        {
+          'origin' => openshift_repos,
+          nil => openshift_repos,
+          'origin-aggregated-logging' => aggregated_logging_repos
+        }[reponame]
+      end
+
+     def self.git_branch_current
         "$(git rev-parse --abbrev-ref HEAD)"
       end
 

data/lib/vagrant-openshift/plugin.rb

@@ -47,6 +47,21 @@ module Vagrant
         Commands::BuildAtomicHost
       end
 
+      command "build-origin-rpm-test" do
+        require_relative "command/build_origin_rpm_test"
+        Commands::BuildOriginRpmTest
+      end
+
+      command "build-origin-images" do
+        require_relative "command/build_origin_images"
+        Commands::BuildOriginImages
+      end
+
+      command "create-local-yum-repo" do
+        require_relative "command/create_local_yum_repo"
+        Commands::CreateLocalYumRepo
+      end
+
       command "build-origin-base" do
         require_relative "command/build_origin_base"
         Commands::BuildOriginBase
@@ -112,11 +127,21 @@ module Vagrant
         Commands::TestSti
       end
 
+      command "test-origin-aggregated-logging" do
+        require_relative "command/test_origin_aggregated_logging"
+        Commands::TestOriginAggregatedLogging
+      end
+
       command "download-artifacts-origin" do
         require_relative "command/download_artifacts_origin"
         Commands::DownloadArtifactsOrigin
       end
 
+      command "download-artifacts-origin-aggregated-logging" do
+        require_relative "command/download_artifacts_origin_aggregated_logging"
+        Commands::DownloadArtifactsOriginAggregatedLogging
+      end
+
       command "download-artifacts-sti" do
         require_relative "command/download_artifacts_sti"
         Commands::DownloadArtifactsSti
@@ -152,6 +177,11 @@ module Vagrant
         Commands::TestOriginImage
       end
 
+      command "sync-origin-aggregated-logging" do
+        require_relative "command/repo_sync_origin_aggregated_logging"
+        Commands::RepoSyncOriginAggregatedLogging
+      end
+
       provisioner(:openshift) do
         require_relative "provisioner"
         Provisioner

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "3.0.3"
+    VERSION = "3.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,6 +126,8 @@ files:
 - lib/vagrant-openshift/action/atomic_host_upgrade.rb
 - lib/vagrant-openshift/action/build_origin.rb
 - lib/vagrant-openshift/action/build_origin_base_images.rb
+- lib/vagrant-openshift/action/build_origin_images.rb
+- lib/vagrant-openshift/action/build_origin_rpm_test.rb
 - lib/vagrant-openshift/action/build_sti.rb
 - lib/vagrant-openshift/action/checkout_repositories.rb
 - lib/vagrant-openshift/action/clean.rb
@@ -133,8 +135,10 @@ files:
 - lib/vagrant-openshift/action/clone_upstream_repositories.rb
 - lib/vagrant-openshift/action/create_ami.rb
 - lib/vagrant-openshift/action/create_bare_repo_placeholders.rb
+- lib/vagrant-openshift/action/create_local_yum_repo.rb
 - 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_sti.rb
 - lib/vagrant-openshift/action/generate_template.rb
 - lib/vagrant-openshift/action/install_origin.rb
@@ -147,6 +151,7 @@ files:
 - 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_origin_aggregated_logging_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
@@ -159,11 +164,15 @@ files:
 - 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_origin_images.rb
+- lib/vagrant-openshift/command/build_origin_rpm_test.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/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_sti.rb
 - lib/vagrant-openshift/command/install_origin.rb
 - lib/vagrant-openshift/command/install_origin_assets_base.rb
@@ -174,8 +183,10 @@ files:
 - lib/vagrant-openshift/command/push_openshift_images.rb
 - 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_sti.rb
 - lib/vagrant-openshift/command/test_origin.rb
+- lib/vagrant-openshift/command/test_origin_aggregated_logging.rb
 - lib/vagrant-openshift/command/test_origin_image.rb
 - lib/vagrant-openshift/command/test_sti.rb
 - lib/vagrant-openshift/command/try_restart_origin.rb