Prefer IPv4 stack for acceptance tests.

voxpupuli · May 6, 2018 · 19b4a11 · 19b4a11
1 parent deebf8b
commit 19b4a11
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ cache:
   - vendor/bundle
   - wget_cache
 rvm:
-  - 2.2.7
-  - 2.3.4
+  - 2.2.8
+  - 2.3.7
 bundler_args: --without acceptance
 script:
   - bundle exec rake syntax
@@ -21,43 +21,46 @@ env:
   - PUPPET_VERSION=4.10.11
   - PUPPET_VERSION=5.5.1
 matrix:
+  exclude:
+  - rvm: 2.2.8
+    env: PUPPET_VERSION=5.5.1
   include:
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
       script: bundle exec rake beaker
       services: docker
       sudo: required
       bundler_args: --with acceptance
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-7 bundle
       script: bundle exec rake beaker
       services: docker
       sudo: required
       bundler_args: --with acceptance
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-1404 bundle
       script: bundle exec rake beaker
       services: docker
       sudo: required
       bundler_args: --with acceptance
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent TEST_profile=wildfly:11.0.0 BEAKER_debug=true BEAKER_set=docker/centos-7
       script: bundle exec rake beaker
       services: docker
       sudo: required
       bundler_args: --with acceptance
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent TEST_profile=wildfly:11.0.0 BEAKER_debug=true BEAKER_set=docker/debian-7
       script: bundle exec rake beaker
       services: docker
       sudo: required
       bundler_args: --with acceptance
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent TEST_profile=wildfly:11.0.0 BEAKER_debug=true BEAKER_set=docker/ubuntu-1404
       script: bundle exec rake beaker

diff --git a/spec/acceptance/1_standalone_spec.rb b/spec/acceptance/1_standalone_spec.rb
@@ -9,6 +9,7 @@ class { 'wildfly':
             version        => '#{test_data['version']}',
             install_source => '#{test_data['install_source']}',
             java_home      => '#{test_data['java_home']}',
+            java_opts      => '-Djava.net.preferIPv4Stack=true',
           }
 
           wildfly::config::module { 'org.postgresql':
@@ -57,7 +58,7 @@ class { 'wildfly':
 
       execute_manifest(pp, :catch_failures => true, :acceptable_exit_codes => [0, 2])
       expect(execute_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      shell('sleep 15')
+      shell('sleep 25')
     end
 
     it 'service wildfly' do

diff --git a/spec/acceptance/2_deployment_spec.rb b/spec/acceptance/2_deployment_spec.rb
@@ -10,6 +10,7 @@ class { 'wildfly':
             version        => '#{test_data['version']}',
             install_source => '#{test_data['install_source']}',
             java_home      => '#{test_data['java_home']}',
+            java_opts      => '-Djava.net.preferIPv4Stack=true',
           }
 
           wildfly::deployment { 'hawtio.war':
@@ -23,7 +24,7 @@ class { 'wildfly':
 
       execute_manifest(pp, :catch_failures => true, :acceptable_exit_codes => [0, 2])
       expect(execute_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      shell('sleep 15')
+      shell('sleep 25')
     end
 
     it 'service wildfly' do

diff --git a/spec/acceptance/3_recursive_resource_spec.rb b/spec/acceptance/3_recursive_resource_spec.rb
@@ -9,6 +9,7 @@ class { 'wildfly':
             version        => '#{test_data['version']}',
             install_source => '#{test_data['install_source']}',
             java_home      => '#{test_data['java_home']}',
+            java_opts      => '-Djava.net.preferIPv4Stack=true',
           }
 
           wildfly::config::module { 'org.postgresql':
@@ -38,7 +39,7 @@ class { 'wildfly':
 
       execute_manifest(pp, :catch_failures => true, :acceptable_exit_codes => [0, 2])
       expect(execute_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      shell('sleep 15')
+      shell('sleep 25')
     end
 
     it 'service wildfly' do

diff --git a/spec/acceptance/4_domain_spec.rb b/spec/acceptance/4_domain_spec.rb
@@ -9,6 +9,7 @@ class { 'wildfly':
             version        => '#{test_data['version']}',
             install_source => '#{test_data['install_source']}',
             java_home      => '#{test_data['java_home']}',
+            java_opts      => '-Djava.net.preferIPv4Stack=true',
             mode           => 'domain',
             host_config    => 'host-master.xml',
           }
@@ -31,7 +32,7 @@ class { 'wildfly':
 
       execute_manifest(pp, :catch_failures => true, :acceptable_exit_codes => [0, 2])
       expect(execute_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      shell('sleep 15')
+      shell('sleep 25')
     end
 
     it 'service wildfly' do