vagrant-openshift 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6fed7895b9c29e2bc6c343bf45e64e77a7826c1
-  data.tar.gz: f5912d91922785dc54314d6c62bf4ee6643eda98
+  metadata.gz: 05edc816ea3867fcd242b1ab2fc58a34104f65fb
+  data.tar.gz: 41b8d65098b4c85bb978bb8c3d0c0f61fdcaf724
 SHA512:
-  metadata.gz: 1a31420933e35afa585e1d08e7e4a563b455ee71ecb2efff5d6796da1779e6756ca485aa23046ccb147b55d57e0082d12305a4b7b67fa72c52705a8e51f9116c
-  data.tar.gz: 51ebaf5f3f26c9a3cb140f2acbd07479e56bdad3c0015e98bba28724f52b3197c8c0593191d08f578d8b05996004e1de8ab58448abe1fb4b14c9ee734ded37f2
+  metadata.gz: d23f49c892ec3a715066f3f662539bdd1ce345bed566c14158fc679284e004441530d0279b1c2507150bcedcbb27108b29ebf622e54a2d7e2adccf05642879a4
+  data.tar.gz: c81b286fe9dd4fe7101a5895e28520ca3b531e933b1c0cc73656057c75f89466a562128189a590dd459d536900d29295974e938c7a0d8d81fd2b8019405b34d1

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

@@ -195,6 +195,7 @@ usermod -a -G docker #{ssh_user}
 
 sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.0.0/16 \\1'," /etc/sysconfig/docker
 sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=172.30.0.0/16 -\\1'," /etc/sysconfig/docker
+sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=ci.dev.openshift.redhat.com:5000 -\\1'," /etc/sysconfig/docker
 sed -i "s,^ADD_REGISTRY='\\(.*\\)',#ADD_REGISTRY='--add-registry=docker.io \\1'," /etc/sysconfig/docker
 
 cat /etc/sysconfig/docker
@@ -215,6 +216,13 @@ then
   sudo lvcreate -n docker-data -l 90%FREE /dev/${VG}
   sudo lvcreate -n docker-metadata -l 50%FREE /dev/${VG}
   sudo sed -i "s,^DOCKER_STORAGE_OPTIONS=.*,DOCKER_STORAGE_OPTIONS='-s devicemapper --storage-opt dm.datadev=/dev/${VG}/docker-data --storage-opt dm.metadatadev=/dev/${VG}/docker-metadata'," /etc/sysconfig/docker-storage
+
+  sudo lvcreate -n openshift-xfs-vol-dir -l 100%FREE /dev/${VG}
+  sudo mkfs.xfs /dev/${VG}/openshift-xfs-vol-dir
+  sudo mkdir -p /tmp/openshift/xfs-vol-dir
+  sudo sh -c "echo /dev/${VG}/openshift-xfs-vol-dir /tmp/openshift/xfs-vol-dir xfs gquota 1 1 >> /etc/fstab"
+  sudo mount /tmp/openshift/xfs-vol-dir
+  sudo chown -R #{ssh_user}:#{ssh_user} /tmp/openshift
 fi
 
 # Force socket reuse

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

@@ -105,18 +105,22 @@ popd >/dev/null
             cmd_env += @options[:envs]
           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], @options[:root])
 
           if env[:test_exit_code] == 0 && @options[:extended_test_packages].length > 0
             cmds = parse_extended(@options[:extended_test_packages])
+
+            extended_cmd_env = []
             # 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 }
+            extended_cmd_env << 'TEST_REPORT_DIR=/tmp/openshift/test-extended/junit'
+            if @options[:image_registry]
+              extended_cmd_env << "OPENSHIFT_TEST_IMAGE_REGISTRY=#{@options[:image_registry]}"
+            end
+            extended_cmd_env_str = extended_cmd_env.join(' ')
+
+            cmds = cmds.map{ |s| "#{extended_cmd_env_str} #{s}".strip }
             env[:test_exit_code] = run_tests(env, cmds, @options[:root])
           end
 

data/lib/vagrant-openshift/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake