Split the puppet versions in hopes the tests don't timeout

kpaulisse · kpaulisse · commit d3c8d065aaba · 2018-02-13T21:44:39.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,13 +8,21 @@ matrix:
   include:
     # Build with latest ruby
     - rvm: 2.4
-      env: RUBOCOP_TEST="true" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="true" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
+    - rvm: 2.4
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="4.10.8"
+    - rvm: 2.4
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.0.0"
     # Build with older ruby versions
-    - rvm: 2.3.2
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
-    - rvm: 2.2.3
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
     - rvm: 2.1
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
+    - rvm: 2.1
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="4.10.8"
+    - rvm: 2.1
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.0.0"
+    - rvm: 2.0
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
+    - rvm: 2.0
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="4.10.8"
     - rvm: 2.0
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.0.0"
diff --git a/script/cibuild b/script/cibuild
@@ -6,7 +6,11 @@
 # with one or more Puppet versions, with PUPPET_VERSIONS set to a space-separated list
 # of versions to test.
 
-[ -z "$PUPPET_VERSIONS" ] && export PUPPET_VERSIONS='3.8.7 4.10.8 5.0.0'
+if [ -z "$PUPPET_VERSIONS" ]; then
+  echo "Required PUPPET_VERSIONS!"
+  exit 255
+fi
+
 [ -z "$RUBOCOP_TEST" ] && export RUBOCOP_TEST='true'
 [ -z "$RSPEC_TEST" ] && export RSPEC_TEST='true'
 
