vagrant-openshift 3.0.8 → 3.0.9

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

@@ -37,14 +37,14 @@ set -ex
 contextdir=$(mktemp -d)
 
 # copy the necessary files
-mkdir $contextdir/{certs,repos,vars}
+mkdir $contextdir/{certs,repos,vars,keys}
 cp /var/lib/yum/*.pem $contextdir/certs
 cp /etc/yum/vars/* $contextdir/vars
 cp /etc/yum.repos.d/* $contextdir/repos
+cp /etc/pki/rpm-gpg/* $contextdir/keys
 
-# yum magic that auto-replaces REGION in repos doesn't work
-# when running inside a docker container, so harcode the value.
-sed -i s/REGION.aws.ce.redhat.com/us-east-1.aws.ce.redhat.com/ $contextdir/repos/redhat-rhui*
+# Remove repositories we won't be needing and which require RH certs
+rm -rf $contextdir/repos/redhat-rhui*
 
 # remove google chrome repo
 rm -rf $contextdir/repos/*chrome*.repo
@@ -58,6 +58,7 @@ RUN yum remove -y subscription-manager
 ADD vars/* /etc/yum/vars/
 ADD repos/* /etc/yum.repos.d/
 ADD certs/* /var/lib/yum/
+ADD keys/* /etc/pki/rpm-gpg/
 
 # 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
@@ -68,8 +69,7 @@ RUN yum update -y && yum clean all
 
 EOF
 
-docker build --rm -t rhel7:latest $contextdir
-docker tag rhel7:latest rhel7.1
+docker build --rm -t rhel7.1 $contextdir
 
 # create Dockerfile
 cat <<EOF > $contextdir/Dockerfile
@@ -80,6 +80,7 @@ RUN yum remove -y subscription-manager
 ADD vars/* /etc/yum/vars/
 ADD repos/* /etc/yum.repos.d/
 ADD certs/* /var/lib/yum/
+ADD keys/* /etc/pki/rpm-gpg/
 
 RUN yum update -y && yum clean all
 
@@ -90,6 +91,28 @@ docker build --rm -t rhel7.2 $contextdir
 # make sure the new rhel7.2 image has valid certs
 docker run rhel7.2 yum install -y tar
 
+# create Dockerfile
+cat <<EOF > $contextdir/Dockerfile
+FROM registry.access.redhat.com/rhel7.3:latest
+
+RUN yum remove -y subscription-manager
+
+ADD vars/* /etc/yum/vars/
+ADD repos/* /etc/yum.repos.d/
+ADD certs/* /var/lib/yum/
+ADD keys/* /etc/pki/rpm-gpg/
+
+RUN yum update -y && yum clean all
+
+EOF
+
+docker build --rm -t rhel7.3 $contextdir
+
+# make sure the new rhel7.3 image has valid certs
+docker run rhel7.3 yum install -y tar
+
+docker tag rhel7.3 rhel7
+
 # cleaning
 rm -rf $contextdir
             })

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

@@ -32,7 +32,7 @@ module Vagrant
           %{
 sudo chmod a+rw /etc/sysconfig/docker
 cat <<EOF > /etc/sysconfig/docker
-OPTIONS='--insecure-registry #{registry_url} --selinux-enabled'
+OPTIONS='--insecure-registry #{registry_url} --selinux-enabled --skip-schema2-push'
 EOF
 sudo systemctl restart docker
           }
@@ -47,20 +47,14 @@ git checkout #{git_ref}
 git_ref=$(git rev-parse --short HEAD)
 echo "Pushing image #{image_name}:#{git_ref}..."
 
-docker tag -f #{centos_namespace}/#{image_name}-centos7 #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}
-docker tag -f #{centos_namespace}/#{image_name}-centos7 #{registry}#{centos_namespace}/#{image_name}-centos7:latest
-docker tag -f #{centos_namespace}/#{image_name}-centos7 docker.io/#{centos_namespace}/#{image_name}-centos7:latest
-docker tag -f #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
-docker tag -f #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest
+docker tag #{centos_namespace}/#{image_name}-centos7 #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}
+docker tag #{centos_namespace}/#{image_name}-centos7 #{registry}#{centos_namespace}/#{image_name}-centos7:latest
+docker tag #{centos_namespace}/#{image_name}-centos7 docker.io/#{centos_namespace}/#{image_name}-centos7:latest
 
 # We can't fully parallelize this because docker fails when you push to the same repo at the
 # same time (using different tags), so we do two groups of push operations.
-# this one is failing in parallel for unknown reasons
-docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
-
 procs[0]="docker push #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}"
 procs[1]="docker push docker.io/#{centos_namespace}/#{image_name}-centos7:latest"
-#procs[2]="docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}"
 
 # Run pushes in parallel
 for i in {0..1}; do
@@ -76,19 +70,16 @@ for pid in ${pids[*]}; do
   wait $pid
 done
 
-procs[0]="docker push #{registry}#{centos_namespace}/#{image_name}-centos7:latest"
-procs[1]="docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest"
+docker push #{registry}#{centos_namespace}/#{image_name}-centos7:latest
 
-# Run pushes in parallel
-for i in {0..1}; do
-  ${procs[${i}]} &
-  pids[${i}]=$!
-done
+if [ #{rhel_namespace} != "SKIP" ]; then
+  docker tag #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
+  docker tag #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest
 
-# Wait for all pushes.  "wait" will check the return code of each process also.
-for pid in ${pids[*]}; do
-  wait $pid
-done
+  # this one is failing when done in parallel for unknown reasons
+  docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
+  docker push #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest
+fi
 
 popd
 set +e
@@ -113,20 +104,24 @@ git_ref=$(git rev-parse --short HEAD)
 echo "Building and testing #{image_name}-centos7:$git_ref ..."
 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" SKIP_SQUASH=1 make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
+sudo env "PATH=$PATH" SKIP_SQUASH=1 SKIP_RHEL_SCL=1 make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
+
 popd
 set +e
           }
         end
 
         def check_latest_image_cmd(registry,namespace,name,git_url)
-          cmd = %{
-        git_ref=$(git ls-remote #{git_url} -h refs/heads/master | cut -c1-7)
-        curl -s http://#{registry}v1/repositories/#{namespace}/#{name}-rhel7/tags/${git_ref} | grep -q "error"
-        if [[ "$?" != "0" ]]; then
-          echo "#{name};$git_ref" >> ~/latest_images
-        fi
+          cmd = ""
+          if $namespace!="SKIP"
+            cmd = %{
+git_ref=$(git ls-remote #{git_url} -h refs/heads/master | cut -c1-7)
+curl -s http://#{registry}v1/repositories/#{namespace}/#{name}-centos7/tags/${git_ref} | grep -q "error"
+if [[ "$?" != "0" ]]; then
+  echo "#{name};$git_ref" >> ~/latest_images
+fi
             }
+          end
           return cmd
         end
 
@@ -141,9 +136,9 @@ set -x
 set +e
 echo "Pre-pulling base images ..."
 docker pull #{@options[:registry]}openshift/base-centos7
-[[ "$?" == "0" ]] && docker tag -f #{@options[:registry]}openshift/base-centos7 openshift/base-centos7
+[[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-centos7 openshift/base-centos7
 docker pull #{@options[:registry]}openshift/base-rhel7
-[[ "$?" == "0" ]] && docker tag -f #{@options[:registry]}openshift/base-rhel7 openshift/base-rhel7
+[[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-rhel7 openshift/base-rhel7
           }
 
           cmd += %{
@@ -151,12 +146,6 @@ docker pull #{@options[:registry]}openshift/base-rhel7
 export PATH=/data/src/github.com/openshift/source-to-image/_output/local/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/bin/linux/amd64:$PATH
           }
 
-          # FIXME: We always need to make sure we have the latest base image
-          # FIXME: This is because the internal registry is pruned once per month
-          if !@options[:build_images].include?("base")
-            @options[:build_images] = "openshift;openshift;base;1;https://github.com/openshift/sti-base;master,#{@options[:build_images]}"
-          end
-
           build_images = @options[:build_images].split(",").map { |i| i.strip }
 
           push_cmd = ""
@@ -177,7 +166,7 @@ export PATH=/data/src/github.com/openshift/source-to-image/_output/local/go/bin:
           check_images = @options[:check_images].split(",").map { |i| i.strip }
           check_images.each do |image|
             centos_namespace,rhel_namespace,name, version, repo_url, git_ref = image.split(';')
-            cmd+= check_latest_image_cmd(@options[:registry],rhel_namespace,name,repo_url)
+            cmd+= check_latest_image_cmd(@options[:registry],centos_namespace,name,repo_url)
           end
 
           do_execute(env[:machine], cmd, :timeout=>60*60*5)

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

@@ -0,0 +1,79 @@
+#--
+# Copyright 2016 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 RunCustomerDiagnosticsTests
+        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}/openshift-ansible/ >/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
+
+        #
+        # 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
+
+          cmd_env << "make #{@options[:target]}"
+          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_asset_tests.rb

@@ -67,9 +67,7 @@ popd >/dev/null
             cmds += @options[:envs]
           end
 
-          cmds << 'hack/verify-dist.sh'
-          cmds << 'grunt test'    
-          cmds << 'hack/test-integration-headless.sh'
+          cmds << 'make test -o build'
           cmd = cmds.join(' ')
           env[:test_exit_code] = run_tests(env, cmds, @options[:root])
 

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

@@ -0,0 +1,83 @@
+#--
+# Copyright 2016 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 RunOriginMetricsTests
+        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-metrics/hack/tests >/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
+
+        #
+        # 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 << './ci_test_every_pr.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

@@ -48,9 +48,9 @@ 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})
+            _,_,exit_code = sudo(env[:machine], cmd, {:timeout => 60*60*12, :fail_on_error => false, :verbose => false})
           else
-            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60*4, :fail_on_error => false, :verbose => false})
+            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60*12, :fail_on_error => false, :verbose => false})
           end
           exit_code
         end
@@ -116,6 +116,11 @@ popd >/dev/null
             if @options[:image_registry]
               extended_cmd_env << "OPENSHIFT_TEST_IMAGE_REGISTRY=#{@options[:image_registry]}"
             end
+
+            if @options[:envs]
+              extended_cmd_env += @options[:envs]
+            end
+
             extended_cmd_env_str = extended_cmd_env.join(' ')
 
             cmds = cmds.map{ |s| "#{extended_cmd_env_str} #{s}".strip }
@@ -134,8 +139,8 @@ popd >/dev/null
           cmds = []
           buckets.each do |bucket|
             if bucket.include?('(')
-              focus = bucket.slice(bucket.index("(")+1..-2).split(" ").map { |i| Shellwords.escape(i.strip) }.join(" ")
-              name = Shellwords.escape(bucket.slice(0..bucket.index("(")-1))
+              focus = bucket.slice(bucket.index("(")+1..-2).split(" ").map { |i| i.strip }.join(" ")
+              name = bucket.slice(0..bucket.index("(")-1)
               cmds << "test/extended/#{name.strip}.sh --ginkgo.focus=\"#{focus}\""
             else
               cmds << "test/extended/#{Shellwords.escape(bucket.strip)}.sh"

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

@@ -33,15 +33,13 @@ module Vagrant
             o.banner = "Usage: vagrant checkout-repos"
             o.separator ""
 
-            o.on("-b [branch-name]", "--branch [branch-name]", String, "Check out the specified branch. Default is 'master'.") do |f|
+            o.on("-b [branch-name]", "--branch [branch-name]", String, "Check out the specified branch. If unset, no checkout happens and the default branch is used (e.g. master).") do |f|
               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
 
           # Parse the options

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

@@ -33,11 +33,11 @@ module Vagrant
           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

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

@@ -0,0 +1,49 @@
+#--
+# Copyright 2016 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 DownloadArtifactsOriginMetrics < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "download the origin-metrics test artifacts"
+        end
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant download-artifacts-origin-metrics [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_metrics_artifacts(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end