vagrant-openshift 1.0.12 → 1.0.13

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

@@ -41,6 +41,14 @@ module Vagrant
             o.on("-d","--artifacts", String, "Download logs") do |f|
               options[:download] = true
             end
+
+            o.on("-s","--skip-image-cleanup", String, "Skip Docker image teardown for E2E test") do |f|
+              options[:skip_image_cleanup] = true
+            end
+
+            o.on("-c","--report-coverage", String, "Generate code coverage report in Jenkins") do |f|
+              options[:report_coverage] = true
+            end
           end
 
           # Parse the options

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

@@ -77,7 +77,7 @@ module Vagrant
 set -x
 
 # so we can call sti
-PATH=/data/bin:$PATH
+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
 
 # create a temp dir to play in
 temp_dir=$(mktemp -d /tmp/image_test.XXXXXXX)
@@ -97,28 +97,19 @@ git checkout #{ref}
 # get git sha1
 git_sha1=`git rev-parse --short #{ref}`
 
-# grab the latest image from the index
-docker pull #{image}:latest
+# Build the STI image we use for testing
+docker build -t #{image}-candidate .
+status=$?
 
-status=0
-
-# build and test the sample app, if it exists
-if [ -d test-app -a -f .sti/bin/test ]; then
-  # build
-  sti build test-app #{image} #{app_name} --clean
+# Run the STI image test framework
+if [ $status -eq 0 ]; then
+  IMAGE_NAME=#{image}-candidate ./test/run
   status=$?
-
-  if [ $status -eq 0 ]; then
-    # run tests
-    docker run --rm -v $temp_dir/#{source_dir}/.sti/bin:/tmp/sti #{app_name} /tmp/sti/test
-
-    status=$?
-  fi
 fi
 
 if [ $status -eq 0 ]; then
   # get the image id
-  image_id=`docker inspect --format="{{ .Id }}" #{image}:latest`
+  image_id=`docker inspect --format="{{ .Id }}" #{image}-candidate:latest`
 
   # tag it devenv-ready
   docker tag $image_id #{image}:devenv-ready

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

@@ -0,0 +1,59 @@
+#--
+# 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 TestSti < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "run the sti tests"
+        end
+
+        def execute
+          options = {}
+          options[:download] = false
+          options[:all] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant test-sti [machine-name]"
+            o.separator ""
+
+            o.on("-a", "--all", String, "Run all tests") do |f|
+              options[:all] = true
+            end
+
+            o.on("-d","--artifacts", String, "Download logs") do |f|
+              options[:download] = true
+            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_sti_tests(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/config.rb

@@ -17,38 +17,26 @@
 module Vagrant
   module Openshift
     class Config < Vagrant.plugin(2, :config)
-      attr_accessor :cloud_domain, :ignore_packages, :additional_services, :container,
-                    :advanced_puppet_values, :repos_base, :os_repo, :os_updates_repo,
-                    :jenkins_repo_base, :optional_repo, :os_extras_repo, :os_scl_repo
+      attr_accessor :cloud_domain, :repos_base, :os_repo, :os_updates_repo,
+                    :optional_repo, :os_extras_repo, :os_scl_repo
 
       def initialize
         super
 
-        @ignore_packages      = UNSET_VALUE
         @cloud_domain         = UNSET_VALUE
-        @additional_services  = UNSET_VALUE
-        @container            = UNSET_VALUE
         @repos_base           = UNSET_VALUE
         @os_repo              = nil
         @os_updates_repo      = nil
         @os_extras_repo       = nil
-        @jenkins_repo_base    = UNSET_VALUE
         @optional_repo        = nil
         @os_scl_repo          = nil
-
-        @advanced_puppet_values = UNSET_VALUE
       end
 
       def finalize!
         super
 
-        @ignore_packages = []             if @ignore_packages == UNSET_VALUE
         @cloud_domain    = "example.com"  if @cloud_domain    == UNSET_VALUE
-        @additional_services = []         if @additional_services == UNSET_VALUE
-        @container           = "selinux"  if @container == UNSET_VALUE
-        @advanced_puppet_values = {}      if @advanced_puppet_values == UNSET_VALUE
         @repos_base = nil         if @repos_base == UNSET_VALUE
-        @jenkins_repo_base = "http://pkg.jenkins-ci.org/redhat/"           if @jenkins_repo_base == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-openshift/constants.rb

@@ -19,33 +19,14 @@ module Vagrant
   module Openshift
     class Constants
 
-      FILTER_BROKER="broker"
-      FILTER_CONSOLE="console"
-      FILTER_IMAGES="images"
-      FILTER_RHC="rhc"
-      FILTER_ORIGIN="origin"
-
       def self.repos(env)
-        is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
-        if is_fedora
-          openshift3_repos
-        else
-          openshift2_repos
-        end
-      end
-
-      def self.openshift2_repos
-        {
-          'origin-server' => 'https://github.com/openshift/origin-server.git',
-          'rhc' => 'https://github.com/openshift/rhc.git',
-          'puppet-openshift_origin' => 'https://github.com/openshift/puppet-openshift_origin.git'
-        }
+        openshift3_repos
       end
 
       def self.openshift3_repos
         {
-          'origin' => 'https://github.com/openshift/origin.git'
-
+          'origin' => 'https://github.com/openshift/origin.git',
+          'source-to-image' => 'https://github.com/openshift/source-to-image.git'
         }.merge(openshift3_images)
       end
 
@@ -56,13 +37,6 @@ module Vagrant
         }
       end
 
-      def self.openshift3_infrastructure_images
-        {
-          'sti-builder' => 'origin/images/builder/docker/sti-builder',
-          'docker-builder' => 'origin/images/builder/docker/docker-builder'
-        }
-      end
-
       def self.images
         [
           'centos'
@@ -85,48 +59,10 @@ module Vagrant
         Pathname.new "/data/src/github.com/openshift/"
       end
 
-      def self.deps_marker
-        Pathname.new "/.origin_deps_installed"
-      end
-
       def self.git_ssh
         ""
       end
 
-      def self.restart_services_cmd(is_fedora)
-        services = [ 'mongod', 'activemq', 'cgconfig', 'cgred', 'named',
-                     'openshift-broker', 'openshift-console',
-                     'openshift-node-web-proxy', 'openshift-watchman',
-                     'sshd', 'httpd' ]
-
-        if(is_fedora)
-          services << 'mcollective'
-        else
-          services << 'ruby193-mcollective'
-        end
-
-        cmd = []
-        cmd += services.map do |service|
-          "/sbin/service #{service} stop;"
-        end
-        cmd << "rm -f /var/www/openshift/broker/httpd/run/httpd.pid;"
-        cmd << "rm -f /var/www/openshift/console/httpd/run/httpd.pid;"
-        cmd += services.map do |service|
-          "/sbin/service #{service} start;"
-        end
-        cmd << "rm -rf /var/www/openshift/broker/tmp/cache/*;"
-        cmd << "/etc/cron.minutely/openshift-facts;"
-        cmd << "/sbin/service openshift-tc start || /sbin/service openshift-tc reload;"
-        if(is_fedora)
-          cmd << "/sbin/service network reload;"
-        else
-          cmd << "/sbin/service network restart;"
-        end
-        cmd << "/sbin/service messagebus restart;"
-        cmd << "/sbin/service oddjobd restart;"
-
-        cmd
-      end
     end
   end
 end

data/lib/vagrant-openshift/helper/command_helper.rb

@@ -19,9 +19,6 @@ require "timeout"
 module Vagrant
   module Openshift
     module CommandHelper
-      def scl_wrapper(is_fedora, command)
-        is_fedora ? command : %{scl enable ruby193 "#{command}"}
-      end
 
       def sudo(machine, command, options={})
         stdout = []

data/lib/vagrant-openshift/plugin.rb

@@ -32,19 +32,14 @@ module Vagrant
         Config
       end
 
-      command "sync-openshift2" do
-        require_relative "command/repo_sync_openshift2"
-        Commands::RepoSyncOpenshift2
-      end
-
       command "sync-openshift3" do
         require_relative "command/repo_sync_openshift3"
         Commands::RepoSyncOpenshift3
       end
 
-      command "build-openshift2-base" do
-        require_relative "command/build_openshift2_base"
-        Commands::BuildOpenshift2Base
+      command "sync-sti" do
+        require_relative "command/repo_sync_sti"
+        Commands::RepoSyncSti
       end
 
       command "build-openshift3-base" do
@@ -57,24 +52,29 @@ module Vagrant
         Commands::BuildOpenshift3
       end
 
+      command "build-sti" do
+        require_relative "command/build_sti"
+        Commands::BuildSti
+      end
+
       command "install-openshift3" do
         require_relative "command/install_openshift3"
         Commands::InstallOpenshift3
       end
 
+      command "install-openshift3-assets-base" do
+        require_relative "command/install_openshift3_assets_base"
+        Commands::InstallOpenshift3AssetsBase
+      end
+
       command "try-restart-openshift3" do
         require_relative "command/try_restart_openshift3"
         Commands::TryRestartOpenshift3
       end
 
-      command "build-openshift3-images" do
-        require_relative "command/build_openshift3_images"
-        Commands::BuildOpenshift3Images
-      end
-
-      command "build-openshift3-infrastructure-images" do
-        require_relative "command/build_openshift3_infrastructure_images"
-        Commands::BuildOpenshift3InfrastructureImages
+      command "build-openshift3-base-images" do
+        require_relative "command/build_openshift3_base_images"
+        Commands::BuildOpenshift3BaseImages
       end
 
       command "origin-init" do
@@ -82,19 +82,14 @@ module Vagrant
         Commands::OpenshiftInit
       end
 
-      command "openshift2-local-checkout" do
-        require_relative "command/local_openshift2_setup"
-        Commands::LocalOpenshift2Setup
-      end
-
       command "openshift3-local-checkout" do
         require_relative "command/local_openshift3_setup"
         Commands::LocalOpenshift3Setup
       end
 
-      command "test-openshift2" do
-        require_relative "command/test_openshift2"
-        Commands::TestOpenshift2
+      command "push-openshift3-release" do
+        require_relative "command/push_openshift3_release"
+        Commands::PushOpenshift3Release
       end
 
       command "test-openshift3" do
@@ -102,6 +97,11 @@ module Vagrant
         Commands::TestOpenshift3
       end
 
+      command "test-sti" do
+        require_relative "command/test_sti"
+        Commands::TestSti
+      end
+
       command "create-ami" do
         require_relative "command/create_ami"
         Commands::CreateAMI
@@ -127,11 +127,6 @@ module Vagrant
         Commands::CheckoutRepositories
       end
 
-      command "install-rhc" do
-        require_relative "command/install_rhc"
-        Commands::InstallRhc
-      end
-
       command "test-openshift3-image" do
         require_relative "command/test_openshift3_image"
         Commands::TestOpenshift3Image

data/lib/vagrant-openshift/provisioner.rb

@@ -39,43 +39,11 @@ module Vagrant
       #
       # No return value is expected.
       def provision
-        #check if OpenShift has been installed
-        #reapply puppet configuration so that IPs and ifcfg-* file is correct
-        if @machine.communicate.test("test -d /etc/openshift")
-          @machine.ui.info("Reapplying puppet script to update changed IP values")
-          hostname = @machine.config.vm.hostname
-          sudo(machine,"echo #{hostname} > /proc/sys/kernel/hostname")
-          sudo(machine,"puppet apply --verbose #{Vagrant::Openshift::Constants.build_dir + 'configure_origin.pp'}", {timeout: 60*20})
-          is_fedora = @machine.communicate.test("test -e /etc/fedora-release")
-
-          sudo(machine,Constants.restart_services_cmd(is_fedora).join("\n"))
-          if @machine.config.openshift.additional_services.size > 0
-            cmd = ""
-            @machine.config.openshift.additional_services.each do |service|
-              cmd += "service #{service} restart;"
-            end
-            sudo(machine,cmd)
-          end
-
-          # TODO: Replace this temporary fix with a complete post-install routine
-          sudo(machine,"oo-admin-ctl-cartridge -c import-node --activate --obsolete && RAILS_ENV=test oo-admin-ctl-cartridge -c import-node --activate --obsolete")
-        else
-          #TODO is_fedora is a temporary fix for the new environment
-          is_fedora = @machine.communicate.test("test -e /etc/fedora-release")
-          if is_fedora
-            ssh_user = machine.ssh_info[:username]
-            sync_dir = Vagrant::Openshift::Constants.sync_dir
-            ## pause to stabilize environment to try to correct odd sudo error on aws
-            sleep 2
-            sudo(machine, "mkdir -p #{sync_dir} && chown -R #{ssh_user}:#{ssh_user} #{sync_dir}")
-          end
-          unless is_fedora || @machine.communicate.test("test -f #{Vagrant::Openshift::Constants.deps_marker}")
-            @machine.ui.info("Preparing base environment")
-            require_relative "command/build_openshift2_base"
-            Vagrant::Openshift::Commands::BuildOpenshift2Base.new([], @machine.env).execute
-            @machine.communicate.sudo("touch #{Vagrant::Openshift::Constants.deps_marker}")
-          end
-        end
+        ssh_user = machine.ssh_info[:username]
+        sync_dir = Vagrant::Openshift::Constants.sync_dir
+        ## pause to stabilize environment to try to correct odd sudo error on aws
+        sleep 2
+        sudo(machine, "mkdir -p #{sync_dir} && chown -R #{ssh_user}:#{ssh_user} #{sync_dir}")
       end
     end
   end

data/lib/vagrant-openshift/templates/builder/Rakefile

@@ -20,212 +20,7 @@ require 'yaml'
 require 'tsort'
 require_relative 'lib/constants'
 require_relative 'lib/options'
-require_relative 'lib/rpm'
-require_relative 'lib/test'
 $stdout.sync = true
 $stderr.sync = true
 
 VALID_IP_ADDR_RE = Regexp.new('^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$')
-
-task :install_deps do
-  spec_files = RPM::get_packages(ignore_packages: OPTIONS[:ignore_packages], ignore_cache: true)
-
-  all_build_dependencies = []
-  all_inst_dependencies  = []
-  spec_files.each do |spec|
-    all_build_dependencies += spec[:build_deps]
-    all_inst_dependencies  += spec[:deps]
-  end
-
-  all_packages = all_build_dependencies + all_inst_dependencies
-
-  all_packages.map! do |name|
-    m = name.match(/(ruby193-)?rubygem[(]([a-z\-_]*)[)]/)
-    if m.nil?
-      name.strip
-    else
-      scl_prefix = m[1].nil? ? "" : m[1]
-      "#{scl_prefix}rubygem-#{m[2]}".strip
-    end
-  end
-
-  all_packages.delete_if { |name| name.match(/openshift/)}
-
-  RPM::install_rpms(all_packages)
-end
-
-task :build_all do
-  FileUtils.rm_rf("/tmp/tito/*")
-  spec_files = RPM::get_packages(remove_os_build_deps: true, ignore_packages: OPTIONS[:ignore_packages], ignore_cache: true)
-  RPM::build_packages(spec_files)
-end
-
-task :clean_rpms do
-  FileUtils.rm_rf("/tmp/tito/*")
-  RPM::uninstall_openshift
-end
-
-task :install_puppet do
-  Dir.chdir((Vagrant::Openshift::Constants.build_dir + "puppet-openshift_origin").to_s) do
-    FileUtils.rm_rf "pkg"
-    system("puppet module build .")
-    pkg = Dir.glob((Vagrant::Openshift::Constants.build_dir + "puppet-openshift_origin/pkg/openshift-openshift_origin*.tar.gz").to_s).first
-    system("puppet module uninstall openshift-openshift_origin")
-    system("puppet module install #{pkg}")
-    system("rm -rf #{Vagrant::Openshift::Constants.build_dir + "puppet-openshift_origin/pkg"}")
-  end
-end
-
-task :update_packages do
-  if  (Vagrant::Openshift::Constants.build_dir + ".built_packages").exist?
-    print "Updating packages\n"
-    RPM::updated_packages
-  else
-    print "Building all packages\n"
-    Rake::Task['build_all'].invoke
-    print "Installing openshift puppet module\n"
-    Rake::Task['install_puppet'].invoke
-    print "Applying openshift puppet recipe\n"
-    system("puppet apply --verbose #{Vagrant::Openshift::Constants.build_dir + 'configure_origin.pp'}")
-  end
-  Rake::Task['restart_services'].invoke
-end
-
-task :restart_services do
-  is_fedora=File.exists?("/etc/fedora-release")
-  system(Vagrant::Openshift::Constants.restart_services_cmd(is_fedora).join("\n"))
-  cmd = ""
-  OPTIONS[:additional_services].each do |service|
-    cmd += "service #{service} restart;"
-  end
-  system(cmd)
-
-  unless system("service openshift-tc status 2>/dev/null 1>/dev/null")
-    system("service openshift-tc reload")
-  end
-
-  # TODO: Replace this temporary fix with a complete post-install routine
-  `oo-admin-ctl-cartridge -c import-node --activate --obsolete && RAILS_ENV=test oo-admin-ctl-cartridge -c import-node --activate --obsolete`
-end
-
-task :checkout_tests do
-  print "Updating remote tests..."
-  system "rm -rf #{Vagrant::Openshift::Constants.build_dir}/openshift-test"
-  git_archive_commands = ''
-  Vagrant::Openshift::Constants.openshift2_repos.each do |repo_name, url|
-    repo_dir = "#{Vagrant::Openshift::Constants.build_dir}/#{repo_name}-bare"
-    git_archive_commands += "pushd #{repo_dir} > /dev/null; git archive --prefix openshift-test/ --format=tar 'HEAD' | (cd #{Vagrant::Openshift::Constants.build_dir} && tar --warning=no-timestamp -xf -); popd > /dev/null; "
-  end
-  git_archive_commands += "pushd #{Vagrant::Openshift::Constants.build_dir}/rhc-bare > /dev/null; git archive --prefix openshift-test/rhc/ --format=tar 'HEAD' | (cd #{Vagrant::Openshift::Constants.build_dir} && tar --warning=no-timestamp -xf -); popd > /dev/null; "
-
-  system %{
-set -e;
-rm -rf #{Vagrant::Openshift::Constants.build_dir}/openshift-test
-#{git_archive_commands}
-mkdir -p /tmp/rhc/junit
-          }
-
-  system(%{
-rm -rf #{Vagrant::Openshift::Constants.build_dir}/openshift-test/tests;
-ln -s #{Vagrant::Openshift::Constants.build_dir}/openshift-test/controller/test/cucumber #{Vagrant::Openshift::Constants.build_dir}/openshift-test/tests
-})
-  print "done\n"
-end
-
-task :create_test_users do
-  system("mkdir -p /etc/openshift && touch /etc/openshift/htpasswd")
-  ['test_user@test.com', 'user_with_multiple_gear_sizes@test.com', 'user_with_extra_storage@test.com', 'user_with_certificate_capabilities@test.com']. each do |user|
-    unless system("/usr/bin/curl -f -k https://openshift.example.com/broker/rest/user -u #{user}:test 2>/dev/null 1>/dev/null")
-
-      # Try to create the user record
-      print "Creating test user:  #{user}\n"
-      user_created   = false
-      create_retries = 0
-      while create_retries < 3 do
-        user_created = system("/usr/bin/htpasswd -b /etc/openshift/htpasswd #{user} test")
-        break if user_created
-        create_retries = create_retries + 1
-        print "Could not add user #{user} to htpasswd file on attempt #{create_retries}\n"
-        sleep 2
-      end
-      if not user_created
-        print "Unable to add user '#{user}' to /etc/openshift/htpasswd\n"
-        exit 1
-      end
-
-      # Test the user record via the REST API
-      rest_connected = false
-      rest_retries   = 0
-      while rest_retries < 3 do
-        rest_connected = system("/usr/bin/curl -f -k https://openshift.example.com/broker/rest/user -u #{user}:test 2>/dev/null 1>/dev/null")
-        break if rest_connected
-        rest_retries = rest_retries + 1
-        print "Could not verify user #{user} via the REST API on attempt #{rest_retries}\n"
-        sleep 10
-      end
-      if not rest_connected
-        print "Unable to verify user #{user} via the REST API\n"
-        exit 1
-      end
-    else
-      print "#{user} already exists\n"
-    end
-  end
-
-  # Create a known test user with medium-sized gears
-  # This must be done before the deployment of application templates!
-  exitcode = system("/usr/sbin/oo-admin-ctl-user -l user_with_multiple_gear_sizes@test.com --addgearsize medium")
-  if(!exitcode)
-    print "Unable to assign medium gear capability to user_with_multiple_gear_sizes@test.com"
-    exit 1
-  end
-
-  # Create a test user with additional storage capabilities
-  exitcode = system("/usr/sbin/oo-admin-ctl-user -l user_with_extra_storage@test.com --setmaxuntrackedstorage 5 --setmaxgears 10")
-  if(!exitcode)
-    print "Unable to assign additional storage to user_with_extra_storage@test.com"
-    exit 1
-  end
-
-  # Create a test user with ssl certificates capabilities
-  exitcode = system("/usr/sbin/oo-admin-ctl-user -l user_with_certificate_capabilities@test.com --allowprivatesslcertificates true")
-  if(!exitcode)
-    print "Unable to assign ssl certificates capabilities to user_with_certificate_capabilities@test.com"
-    exit 1
-  end
-
-  unless system("test -e  /root/.ssh/id_rsa")
-    system("ssh-keygen -q -f /root/.ssh/id_rsa -P \"\" </dev/null")
-  end
-end
-
-task :idle_all_gears do
-  Test.new.idle_all_gears
-end
-
-task :run_tests do
-  options = {}
-  options[:fixme] = ENV["fixme"] == "true"
-  if ENV["extended"] == "true"
-    options[:gear_extended]   = ENV["gear"] == "true"
-    options[:node_extended]   = ENV["node"] == "true"
-    options[:cart_extended]   = ENV["cart"] == "true"
-    options[:broker_extended] = ENV["broker"] == "true"
-    options[:rhc_extended]    = ENV["rhc"] == "true"
-    options[:console_extended] = ENV["console"] == "true"
-    options[:node]    = false
-    options[:cart]    = false
-    options[:broker]  = false
-    options[:rhc]     = false
-    options[:console] = false
-  else
-    options[:gear]    = ENV["gear"] == "true"
-    options[:node]    = ENV["node"] == "true"
-    options[:cart]    = ENV["cart"] == "true"
-    options[:broker]  = ENV["broker"] == "true"
-    options[:rhc]     = ENV["rhc"] == "true"
-    options[:console] = ENV["console"] == "true"
-  end
-
-  Test.new.test(options)
-end