include acceptance stage on travis

diff --git a/.sync.yml b/.sync.yml
index 07599062d35aa637a3d4009510845783d285e958..bfbdd04f11ba4edb16287ea7e65274d60203ba67 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -23,6 +23,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -37,6 +38,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -51,6 +53,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
 
 appveyor.yml:
   delete: true

diff --git a/.travis.yml b/.travis.yml
index bdb5e4a916749953703f5c5fe8387e1d2e4bb7c0..5fe6952c0b5b73416a7d6da997e3eeafe4804180 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
@@ -54,6 +55,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
@@ -63,6 +65,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
 branches:
   only:

diff --git a/Gemfile b/Gemfile
index f7560c16269fc8043a9907bc336c49a8e502a1f3..0e395e7ecbf02b49b6256e46126da8eac57527e3 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,4 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master'
 
 def location_for(place_or_version, fake_version = nil)
   git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}

diff --git a/metadata.json b/metadata.json
index dca41d29409cd51641d3879d3f4744b1edb036cc..1af4492ca399cceff951de92807fbba592a1f088 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -77,6 +77,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "1.14.1-0-g0b5b39b",
-  "pdk-version": "1.14.0"
+  "template-ref": "tags/1.14.1-0-g0b5b39b",
+  "pdk-version": "1.14.1"
 }