From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 27 May 2015 15:25:44 +0000 (-0700)
Subject: Fix travis.yml for puppet 4
X-Git-Tag: 2.1.0~6^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a467f1b978976b3283161bae04ef00225f757f94;p=puppet-modules%2Fpuppetlabs-apt.git

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 3c87782..625d045 100644
--- 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 2abfca1..8b6adc2 100644
--- 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