Merge pull request #883 from glennsarti/test

[puppet-modules/puppetlabs-apt.git] / .sync.yml

diff --git a/.sync.yml b/.sync.yml
index 4adfb674a03b03bdf35c8a44461d9ed898702481..516ddebd6d982faaf79b4535577955e93e507567 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -14,35 +14,43 @@
       - rubocop-rspec
 
 .travis.yml:
-  docker_sets:
-    - set: docker/debian-8
-    - set: docker/ubuntu-14.04
-  docker_defaults:
-    bundler_args: ""
-  secure: ""
   branches:
     - release
+  includes:
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORMS=deb_puppet5
+      rvm: 2.5.3
+      before_script:
+        - bundle exec rake 'litmus:provision_list[travis_deb]'
+        - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
+        - bundle exec rake 'litmus:install_agent[puppet5]'
+        - bundle exec rake litmus:install_module
+      script:
+        - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      bundler_args:
+      dist: trusty
+      env: PLATFORM=deb_puppet6
+      rvm: 2.5.3
+      before_script:
+        - bundle exec rake 'litmus:provision_list[travis_deb]'
+        - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
+        - bundle exec rake 'litmus:install_agent[puppet6]'
+        - bundle exec rake litmus:install_module
+      script:
+        - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
 
 appveyor.yml:
   delete: true
 
 Gemfile:
-  required:
-    ':system_tests':
-      - gem: 'puppet-module-posix-system-r#{minor_version}'
-        platforms: ruby
-      - gem: 'puppet-module-win-system-r#{minor_version}'
-        platforms:
-          - mswin
-          - mingw
-          - x64_mingw
-      - gem: 'puppet_litmus'
-        platforms:
-          - ruby
-          - mswin
-          - mingw
-          - x64_mingw
-        condition: "ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}"
   optional:
     ':development':
       - gem: 'github_changelog_generator'
@@ -54,7 +62,6 @@ Gemfile:
 Rakefile:
   requires:
     - puppet_pot_generator/rake_tasks
-  use_litmus_tasks: true
 
 spec/spec_helper.rb:
   mock_with: ':rspec'