aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2014-11-27 13:50:22 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2014-11-27 13:50:22 +0100
commit1d30a45c4ddc648f903b6ac6d7b91664f5f902f1 (patch)
tree9d7d3b39d85468f5eccaa89e6f02932dd7b11e84
parentf8cf7b52fba053c3c7f911f317e4dfdc5ae9592b (diff)
downloadpuppet-dhcp-1d30a45c4ddc648f903b6ac6d7b91664f5f902f1.tar.gz
puppet-dhcp-1d30a45c4ddc648f903b6ac6d7b91664f5f902f1.tar.bz2
Use FUTURE_PARSER=yes instead of PUPPET_PARSER=future
-rw-r--r--.travis.yml4
-rw-r--r--spec/spec_helper.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 0cc99fb..ea09e8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,10 @@ matrix:
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
- env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future"
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
allow_failures:
- rvm: 2.0.0
- env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future"
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
notifications:
email: false
deploy:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9675ded..cf5db0b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -23,7 +23,7 @@ RSpec.configure do |c|
Puppet.settings[:strict_variables]=true
end
- if ENV['PUPPET_PARSER'] == 'future'
+ if ENV['FUTURE_PARSER'] == 'yes'
c.parser='future'
end
end