vagrant-openshift 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1584aaecd50419fb014eed0a6f3bad0873b81626
-  data.tar.gz: d06b80e9a2c6091157c2c87520ebbba1ee34b666
+  metadata.gz: 0c1d9f532660bb3adc5e3749b5fba4d3c52b1154
+  data.tar.gz: 7ffa2c5f6f5d4a483e0f9896a28d294f1f295654
 SHA512:
-  metadata.gz: 4ddb3d7fc7d20ef670454074b287bbf37cce4b51da7f2a3713294270e7c93a13f59e773283058088b27c9f071be7c9d79a35fb2ee671ebbdf38dbae1dae06d9a
-  data.tar.gz: b062a6d37cd9d36120260861e7b38c28b48621d9f4e7a0c2aed11e98642f2cf1e2e692da24cd8f3a4c1cc8c56676aac21ed805ae0b5bbef9d030110e07da9596
+  metadata.gz: 383500d85b7811455243bfbe40b76fe05033bafb0037083b839a4438983866cf236bdcff260c0383cc5ed0ba139db1d11659f0e4bf4bac5792a21b60b2320cab
+  data.tar.gz: b6e221c7ec9637cb95269249e6f3e32189bd7c9184e3b9055bf1fbce15521596cf56017116e6ae0e6576c89270db9d0bc478d355c01c450fb3ea1ad1f8d53878

data/.travis.yml

@@ -1,7 +1,5 @@
 rvm:
   - 2.0.0
-  - 2.1.7
-  - 2.2.3
 
 gemfile: Gemfile
 

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

@@ -34,7 +34,7 @@ pushd /data/src/github.com/openshift/origin
   hack/build-base-images.sh
 popd
 },
-            { :timeout => 60*20, :verbose => false })
+            { :timeout => 60*30, :verbose => false })
           @app.call(env)
         end
 

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

@@ -34,12 +34,14 @@ module Vagrant
 
           artifacts_dir = Pathname.new(File.expand_path(machine.env.root_path + "artifacts"))
           download_map = {
-            "/var/log/yum.log"                     => artifacts_dir + "yum.log",
-            "/var/log/secure"                      => artifacts_dir + "secure",
-            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log",
-            "/tmp/origin/e2e/"                     => artifacts_dir + "e2e/",
-            "/tmp/openshift-extended-tests/"       => artifacts_dir + "extended-tests/",
-            "/tmp/openshift-cmd/"                  => artifacts_dir + "cmd/",
+            "/var/log/yum.log"               => artifacts_dir + "yum.log",
+            "/var/log/secure"                => artifacts_dir + "secure",
+            "/var/log/audit/audit.log"       => artifacts_dir + "audit.log",
+            "/tmp/openshift/"                => artifacts_dir,
+            "/tmp/origin/e2e/"               => artifacts_dir + "e2e/",
+            "/tmp/openshift-extended-tests/" => artifacts_dir + "extended-tests/",
+            "/tmp/openshift-cmd/"            => artifacts_dir + "cmd/",
+            "/tmp/openshift-integration/"    => artifacts_dir + "integration/",
 
             "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
             "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/"

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

@@ -59,13 +59,17 @@ popd
 
           if @options[:backup_assets]
             cmd += %{
+  # Make sure tests pass before backing up this asset install
+  pushd $ORIGIN_PATH
+    hack/test-assets.sh
+  popd
   mkdir -p $ASSET_BACKUP_DIR
   cp -rf $ORIGIN_PATH/assets/node_modules $ASSET_BACKUP_DIR/node_modules
   cp -rf $ORIGIN_PATH/assets/bower_components $ASSET_BACKUP_DIR/bower_components
 }
           end
 
-          do_execute(env[:machine], cmd, :verbose => false, :timeout=>60*20)
+          do_execute(env[:machine], cmd, :verbose => false, :timeout=>60*60)
           @app.call(env)
         end
       end

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

@@ -57,6 +57,7 @@ fi
                                 gcc \
                                 gcc-c++ \
                                 glibc-static \
+                                gnuplot \
                                 httpie \
                                 hg \
                                 jq \
@@ -73,6 +74,7 @@ fi
                                 screen \
                                 socat \
                                 sqlite-devel \
+                                sysstat \
                                 tig \
                                 tmux \
                                 unzip \
@@ -80,9 +82,9 @@ fi
                                 wget \
                                 xfsprogs \
                                 Xvfb \
-                                yum-utils",:timeout=>60*20, :verbose => false)
+                                yum-utils",:timeout=>60*30, :verbose => false)
 
-          sudo(env[:machine], "yum install -y facter", fail_on_error: false, :timeout=>60*10, :verbose => false)
+          sudo(env[:machine], "yum install -y facter", fail_on_error: false, :timeout=>60*20, :verbose => false)
 
           # Install Chrome and chromedriver for headless UI testing
           sudo(env[:machine], %{
@@ -105,16 +107,38 @@ unzip chromedriver_linux64.zip
 mv chromedriver /usr/bin/chromedriver
 chown root /usr/bin/chromedriver
 chmod 755 /usr/bin/chromedriver
-          }, :timeout=>60*10, :verbose => false)
+          }, :timeout=>60*20, :verbose => false)
 
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
           #        installed. See BZ#1101508
           #
-          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src", :timeout=>60*10, :verbose => false)
+          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src", :timeout=>60*20, :verbose => false)
           #
           sudo(env[:machine], %{
 set -ex
+
+if [[ -e /etc/redhat-release && ! -e /etc/fedora-release && ! -e /etc/centos-release ]]; then
+
+# create rhaos repo
+cat <<EOF > /etc/yum.repos.d/rhaos.repo
+[rhel-7-server-ose-3.1-rpms]
+name=RHEL7 Red Hat Atomic OpenShift 3.1
+baseurl=https://mirror.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
+        https://use-mirror1.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
+        https://use-mirror2.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
+        https://euw-mirror1.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
+enabled=1
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
+failovermethod=priority
+sslverify=0
+sslclientcert=/var/lib/yum/client-cert.pem
+sslclientkey=/var/lib/yum/client-key.pem
+
+EOF
+fi
+
 if ! test -e /etc/fedora-release; then
   # TODO Remove me ASAP
   sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
@@ -146,7 +170,10 @@ echo "Detected go version: $(go version)"
 if [[ ${GO_VERSION[2]} == "go1.4"* ]]; then
   GOPATH=/data go get golang.org/x/tools/cmd/cover
 
+# https://groups.google.com/forum/#!topic/golang-nuts/nZLhcbaa3wQ
+set +e
   GOPATH=/data go get golang.org/x/tools/cmd/vet
+set -e
 
   # Check out a stable commit for go vet in order to version lock it to something we can work with
   pushd /data/src/golang.org/x/tools >/dev/null

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

@@ -55,6 +55,11 @@ ADD vars/* /etc/yum/vars/
 ADD repos/* /etc/yum.repos.d/
 ADD certs/* /var/lib/yum/
 
+# we're picking up 7.2 packages in our 7.1 image and these two conflict, so
+# first replace the 7.1 package with the new 7.2 package so later updates/dep
+# installations don't fail.
+RUN yum swap -y -- remove systemd-container\* -- install systemd systemd-libs
+
 RUN yum update -y && yum clean all
 
 EOF
@@ -62,6 +67,22 @@ EOF
 docker build --rm -t rhel7:latest $contextdir
 docker tag rhel7:latest rhel7.1
 
+# create Dockerfile
+cat <<EOF > $contextdir/Dockerfile
+FROM registry.access.redhat.com/rhel7.2:latest
+
+RUN yum remove -y subscription-manager
+
+ADD vars/* /etc/yum/vars/
+ADD repos/* /etc/yum.repos.d/
+ADD certs/* /var/lib/yum/
+
+RUN yum update -y && yum clean all
+
+EOF
+
+docker build --rm -t rhel7.2 $contextdir
+
 # cleaning
 rm -rf $contextdir
             })

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

@@ -33,51 +33,20 @@ module Vagrant
           if ssh_id_file.kind_of?(Array)
             ssh_id_file = ssh_id_file.first
           end
-          ssh_id   = env[:machine].id.gsub("-","")
 
-          ssh_config_path = Pathname.new(File.expand_path("~/.ssh/config"))
-          ssh_config_str = %{
-Host verifier
-  HostName     #{ssh_host}
-  Port         #{ssh_port}
-  User         #{ssh_user}
-  IdentityFile #{ssh_id_file}
-  StrictHostKeyChecking no
-
-          }
-
-          if ssh_config_path.exist?
-            if system( "grep -n 'Host verifier' #{ssh_config_path}" )
-              lines = File.new(ssh_config_path.to_s).readlines
-              lines.map!{ |line| line.rstrip }
-              idx = lines.index{ |l| l.match(/Host verifier/)}
-
-              lines.delete_at(idx)
-              while(not (lines[idx].nil? or lines[idx].match(/Host /)))
-                lines.delete_at(idx)
-              end
-
-              File.open(ssh_config_path.to_s, "w") do |file|
-                file.write(lines.join("\n"))
-                file.write(ssh_config_str)
-              end
-            else
-              File.open(ssh_config_path.to_s, "a") do |file|
-                file.write(ssh_config_str)
-              end
-            end
-          else
-            File.open(ssh_config_path.to_s, "w") do |file|
-              file.write(ssh_config_str)
-            end
-            FileUtils.chmod(0600, ssh_config_path.to_s)
+          vagrant_openshift_ssh_override_path = Constants.git_ssh
+          vagrant_openshift_ssh_override_str = "/usr/bin/ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PasswordAuthentication=no -i #{ssh_id_file} $@"
+          File.open(vagrant_openshift_ssh_override_path.to_s, "w") do |file|
+            file.write(vagrant_openshift_ssh_override_str)
           end
+          FileUtils.chmod(0744, vagrant_openshift_ssh_override_path.to_s)
 
           home_dir=File.join(ENV['HOME'], '.openshiftdev/home.d')
           if File.exists?(home_dir)
             Dir.glob(File.join(home_dir, '???*'), File::FNM_DOTMATCH).each {|file|
               puts "Installing ~/#{File.basename(file)}"
-              system "scp #{file} verifier:"
+              puts "#{ssh_id_file} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{file} #{ssh_user}@#{ssh_host}:#{ssh_port}"
+              system "scp -P #{ssh_port} -i #{ssh_id_file} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{file} #{ssh_user}@#{ssh_host}:~"
             }
           end
 

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

@@ -180,7 +180,7 @@ export PATH=/data/src/github.com/openshift/source-to-image/_output/local/go/bin:
             cmd+= check_latest_image_cmd(@options[:registry],rhel_namespace,name,repo_url)
           end
 
-          do_execute(env[:machine], cmd)
+          do_execute(env[:machine], cmd, :timeout=>60*60*5)
 
           @app.call(env)
         end

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

@@ -37,7 +37,7 @@ pushd /data/src/github.com/openshift/origin
   OS_PUSH_BASE_IMAGES="#{push_base ? 'true' : ''}" OS_PUSH_BASE_REGISTRY="#{registry_name}" hack/push-release.sh
 popd
 },
-            { :timeout => 60*20, :verbose => false })
+            { :timeout => 60*30, :verbose => false })
           @app.call(env)
         end
 

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

@@ -74,10 +74,9 @@ popd >/dev/null
           end
 
           if @options[:all]
-            cmd_env << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts'
-            cmd_env << 'LOG_DIR=/tmp/origin/e2e/logs'
             cmd_env << 'TEST_ASSETS=true'
             cmd_env << 'TEST_ASSETS_HEADLESS=true'
+            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
@@ -94,6 +93,10 @@ popd >/dev/null
             cmd_env << 'OUTPUT_COVERAGE=/tmp/origin/e2e/artifacts/coverage'
           end
 
+          if @options[:image_registry]
+            cmd_env << "OPENSHIFT_TEST_IMAGE_REGISTRY=#{@options[:image_registry]}"
+          end
+
           cmd = cmd_env.join(' ') + ' ' + build_targets.join(' ')
           env[:test_exit_code] = run_tests(env, [cmd], false)
 

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

@@ -55,14 +55,16 @@ module Vagrant
 
             puts "Synchronizing [#{repo_name}@#{branch}] from #{File.basename(FileUtils.pwd)}..."
 
-            command = ""
-            unless Constants.git_ssh.nil? or Constants.git_ssh.empty?
-              command += "export GIT_SSH=#{Constants.git_ssh};\n"
-            end
+            ssh_user = machine.ssh_info[:username]
+            ssh_host = machine.ssh_info[:host]
+            ssh_port = machine.ssh_info[:port]
+
+            command = "export GIT_SSH=#{Constants.git_ssh};\n"
+
             if branch == 'origin/master'
-              command += "git push -q verifier:#{Constants.build_dir + repo_name}-bare master:master --tags --force;\n"
+              command += "git push -q ssh://#{ssh_user}@#{ssh_host}:#{ssh_port}#{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"
+            command += "git push -q ssh://#{ssh_user}@#{ssh_host}:#{ssh_port}#{Constants.build_dir + repo_name}-bare #{branch}:master --tags --force"
 
             exit_status = 1
             retries = 0

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

@@ -28,7 +28,7 @@ module Vagrant
         def call(env)
           sudo env[:machine], "rm -rf /etc/yum.repos.d/openshift-origin.repo"
           sudo env[:machine], "yum clean all"
-          sudo env[:machine], "yum -y update --skip-broken --exclude=kernel*", {fail_on_error: false, :timeout=>60*10}
+          sudo env[:machine], "yum -y update --skip-broken --exclude=kernel*", {fail_on_error: false, :timeout=>60*30}
           sudo env[:machine], "yum list installed"
 
           env[:machine].ui.warn "Increasing YUM cache timeout to 9999999. You will need manually clear cache to get additional updates."

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

@@ -62,6 +62,10 @@ module Vagrant
             o.on("-j","--parallel", String, "Run parallel make") do |f|
               options[:parallel] = true
             end
+
+            o.on("-r","--image-registry", String, "Image registry to configure tests with") do |f|
+              options[:image_registry] = f
+            end
           end
 
           # Parse the options

data/lib/vagrant-openshift/constants.rb

@@ -47,7 +47,7 @@ module Vagrant
       end
 
       def self.git_ssh
-        ""
+        Pathname.new(File.expand_path("~/.ssh/vagrant_openshift_ssh_override"))
       end
 
     end

data/lib/vagrant-openshift/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake