Fix travis.yml for puppet 4

I accidentally pushed a commit with modulesync that made puppet 4 a
non-voting job. This should make it more in line with modulesync.

Also, we should look at bumping these ORDERING="random" changes back to
msync if they are valuable.

diff --git a/.sync.yml b/.sync.yml
index 3c87782f80bb228ba02958c626b580bc5a371fe9..625d045a31cb5c34bc33735899b5a5d708722bb6 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,8 +7,9 @@
     env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
-  - rvm: 2.0.0
+  - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" ORDERING="random"
+    allow_failures:
 Gemfile:
   required:
     ':development, :unit_tests':

diff --git a/.travis.yml b/.travis.yml
index 2abfca13735fe5c4b2cdb600998e432cd0a0a054..8b6adc2d2cf7291585c6b69f1dd668fcd79e8a33 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,7 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
-  - rvm: 2.0.0
+  - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" ORDERING="random"
-  allow_failures:
-    - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false