vagrant-openshift 3.0.3 → 3.0.4

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

@@ -38,7 +38,7 @@ module Vagrant
           end
           Dir.chdir(go_path) do
             commands = "echo 'Waiting for the cloning process to finish'\n"
-            Constants.openshift_repos.each do |repo, url|
+            Constants.repos_for_name(@options[:repo]).each do |repo, url|
               commands += repo_checkout_bash_command(repo, url)
             end
 

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

@@ -111,9 +111,9 @@ git init && git remote add -t master origin #{repo_url}
 git fetch && git checkout #{git_ref}
 git_ref=$(git rev-parse --short HEAD)
 echo "Building and testing #{image_name}-centos7:$git_ref ..."
-sudo env "PATH=$PATH" make test TARGET=centos7 VERSION=#{version} TAG_ON_SUCCESS=true
+sudo env "PATH=$PATH" SKIP_SQUASH=1 make test TARGET=centos7 VERSION=#{version} TAG_ON_SUCCESS=true
 echo "Building and testing #{image_name}-rhel7:$git_ref ..."
-sudo env "PATH=$PATH" make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
+sudo env "PATH=$PATH" SKIP_SQUASH=1 make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
 popd
 set +e
           }

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

@@ -0,0 +1,88 @@
+#--
+# 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 RunOriginAggregatedLoggingTests
+        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-aggregated-logging/hack/testing >/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
+
+        #
+        # 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
+
+          cmd_env = []
+
+          if @options[:envs]
+            cmd_env += @options[:envs]
+          end
+
+          if @options[:image_registry]
+            cmd_env << "OPENSHIFT_TEST_IMAGE_REGISTRY=#{@options[:image_registry]}"
+          end
+
+          cmd_env << './logging.sh'
+          cmd = cmd_env.join(' ')
+          env[:test_exit_code] = run_tests(env, [cmd], @options[:root])
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -67,30 +67,42 @@ 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
+
           build_targets = ["make"]
           if @options[:parallel]
             build_targets << '-j'
             build_targets << '--output-sync=recurse'
           end
 
-          if @options[:all]
-            cmd_env << 'TEST_ASSETS=true'
-            cmd_env << 'TEST_ASSETS_HEADLESS=true'
+          # call specific make targets
+          if @options[:target]
+            @options[:all] = nil
+            build_targets = build_targets << @options[:target]
+
+          # run bulk tests
+          elsif  @options[:all]
             cmd_env << 'TESTFLAGS=\'"" -p=4\''
             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]
-              cmd_env << 'SKIP_IMAGE_CLEANUP=1'
-            end
+          # run the check target only
           else
+
             build_targets << "check" if !@options[:skip_check]
           end
 
           if @options[:report_coverage]
-            cmd_env << 'OUTPUT_COVERAGE=/tmp/origin/e2e/artifacts/coverage'
+            # TODO(skuznets): make this a boolean and pass it through --env instead, to allow
+            # openshift/origin/hack/test-go.sh to choose where it places this artifact
+            cmd_env << 'OUTPUT_COVERAGE=/tmp/openshift/test-go/artifacts'
+          end
+
+          if @options[:envs]
+            cmd_env += @options[:envs]
           end
 
           if @options[:image_registry]
@@ -98,19 +110,20 @@ popd >/dev/null
           end
 
           cmd = cmd_env.join(' ') + ' ' + build_targets.join(' ')
-          env[:test_exit_code] = run_tests(env, [cmd], false)
+          env[:test_exit_code] = run_tests(env, [cmd], @options[:root])
 
           if env[:test_exit_code] == 0 && @options[:extended_test_packages].length > 0
             cmds = parse_extended(@options[:extended_test_packages])
-            cmds = cmds.map{ |s| 'TEST_REPORT_DIR=/tmp/openshift-extended-tests/junit/extended ' + s }
-            env[:test_exit_code] = run_tests(env, cmds, true)
+            # TODO(skuznets): make this a boolean and pass it through --env instead, to allow
+            # openshift/origin/test/extended/util/test.go to choose where it places this artifact
+            cmds = cmds.map{ |s| 'TEST_REPORT_DIR=/tmp/openshift/test-extended/junit ' + s }
+            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, false)
+            env[:test_exit_code] = run_tests(env, cmds, @options[:root])
           end
 
           @app.call(env)

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

@@ -20,15 +20,16 @@ module Vagrant
       class SyncLocalRepository
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options={})
           @app = app
           @env = env
+          @options = options
         end
 
         def call(env)
           env[:machine].env.ui.info("Synchronizing local sources")
 
-          Constants.repos(env).each do |repo_name, url|
+          Constants.repos_for_name(@options[:repo]).each do |repo_name, url|
             local_repo = Pathname.new(File.expand_path(File.join(env[:machine].env.root_path, "..", repo_name)))
             unless local_repo.exist?
               local_repo = Pathname.new(File.expand_path(File.join(env[:machine].env.root_path, repo_name)))

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

@@ -44,6 +44,10 @@ obsoletes=1
 gpgcheck=0
 plugins=1
 installonly_limit=3
+retries=20
+timeout=120
+
+
 
 #  This is the default, if you make this bigger yum won't see if the metadata
 # is newer on the remote and so you'll "gain" the bandwidth of not having to

data/lib/vagrant-openshift/action.rb

@@ -27,6 +27,24 @@ module Vagrant
         end
       end
 
+      def self.build_origin_rpm_test(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BuildOriginRpmTest
+        end
+      end
+
+      def self.build_origin_images(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BuildOriginImages, options
+        end
+      end
+
+      def self.create_local_yum_repo(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CreateLocalYumRepo, options
+        end
+      end
+
       def self.build_origin_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CreateYumRepositories
@@ -119,6 +137,26 @@ module Vagrant
         end
       end
 
+      def self.repo_sync_origin_aggregated_logging(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use PrepareSshConfig
+          if options[:source]
+            if options[:clean]
+              b.use(Clean, options)
+              b.use(CloneUpstreamRepositories, options)
+            end
+            b.use(SyncLocalRepository, options)
+            b.use(CheckoutRepositories, options)
+          end
+          # no build support currently
+          # if options[:build]
+          #   b.use(BuildOriginBaseImages, options) if options[:images]
+          #   b.use(BuildOrigin, options)
+          #   b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
+          # end
+        end
+      end
+
       def self.local_origin_checkout(options)
         Vagrant::Action::Builder.new.tap do |b|
           if not options[:no_build]
@@ -137,6 +175,16 @@ module Vagrant
         end
       end
 
+      def self.run_origin_aggregated_logging_tests(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use RunOriginAggregatedLoggingTests, options
+          if options[:download]
+            b.use DownloadArtifactsOriginAggregatedLogging
+          end
+          b.use TestExitCode
+        end
+      end
+
       def self.run_sti_tests(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use RunStiTests, options
@@ -159,6 +207,12 @@ module Vagrant
         end
       end
 
+      def self.download_origin_aggregated_logging_artifacts(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use DownloadArtifactsOriginAggregatedLogging
+        end
+      end
+
       def self.gen_template(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use GenerateTemplate, options
@@ -237,16 +291,21 @@ module Vagrant
       autoload :CreateBareRepoPlaceholders, action_root.join("create_bare_repo_placeholders")
       autoload :RunOriginTests, action_root.join("run_origin_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")
       autoload :CreateAMI, action_root.join("create_ami")
       autoload :ModifyInstance, action_root.join("modify_instance")
       autoload :ModifyAMI, action_root.join("modify_ami")
       autoload :DownloadArtifactsOrigin, action_root.join("download_artifacts_origin")
       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")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
       autoload :RunSystemctl, action_root.join("run_systemctl")
       autoload :AtomicHostUpgrade, action_root.join("atomic_host_upgrade")
+      autoload :BuildOriginRpmTest, action_root.join("build_origin_rpm_test")
+      autoload :CreateLocalYumRepo, action_root.join("create_local_yum_repo")
+      autoload :BuildOriginImages, action_root.join("build_origin_images")
     end
   end
 end

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

@@ -0,0 +1,58 @@
+#--
+# 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 BuildOriginImages < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "Build origin Dockerfiles from local generated RPMs"
+        end
+
+        def execute
+          options = {}
+          options[:clean] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant build-origin-images [vm-name]"
+            o.on("--images [list]", String, "List of images delimited by ','") do |i|
+              options[:images] = i
+            end
+            o.separator ""
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          if options[:images].nil?
+            @env.ui.warn "You must specify list of images to build, delimited by ','"
+            exit
+          end
+
+          with_target_vms(argv, :reverse => true) do |machine|
+            actions = Vagrant::Openshift::Action.build_origin_images(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+#--
+# 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 BuildOriginRpmTest < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "Build origin RPM with tito and test"
+        end
+
+        def execute
+          options = {}
+          options[:clean] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant build-origin-rpm-test [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.build_origin_rpm_test(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,6 +27,7 @@ module Vagrant
 
         def execute
           options = {}
+          options[:repo] = 'origin'
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant checkout-repos"
@@ -36,6 +37,10 @@ module Vagrant
               options[:branch] = {"origin-server" => f}
             end
 
+            o.on("-r [repo-name]", "--repo [repo-name]", String, "Check out the specified repo. Default is 'origin'.") do |f|
+              options[:repo] = f
+            end
+
            #@options[:branch][repo_name]
           end
 
@@ -52,4 +57,4 @@ module Vagrant
       end
     end
   end
-end
+end