jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338746 )
Change subject: Use puppet-syntax to check puppet manifests ...................................................................... Use puppet-syntax to check puppet manifests Delete integration-config-puppet-validate and replace it by integration-config-rake-jessie. It only triggers on ruby/pp changes. Bug: T158544 Change-Id: I608d01656f5bc56e45dacb681d248ca315b546fd --- M .gitignore A Gemfile A Rakefile M jjb/integration.yaml M zuul/layout.yaml 5 files changed, 24 insertions(+), 3 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 5ccebc9..da95b48 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ *~ *.kate-swp .*.swp + +/Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..2bafbed --- /dev/null +++ b/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' + +gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0', require: false +gem 'puppetlabs_spec_helper', '< 2.0.0', require: false + +# Puppet 3.7 fails on ruby 2.2+ +# https://tickets.puppetlabs.com/browse/PUP-3796 +gem 'safe_yaml', '~> 1.0.4', require: false diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..0a8393f --- /dev/null +++ b/Rakefile @@ -0,0 +1,11 @@ +require 'puppet-syntax/tasks/puppet-syntax' + +task :default => [:help] + +desc 'Run all build/tests commands (CI entry point)' +task test: [:syntax] + +desc 'Show the help' +task :help do + system 'rake -T' +end diff --git a/jjb/integration.yaml b/jjb/integration.yaml index fcb28d2..37756b1 100644 --- a/jjb/integration.yaml +++ b/jjb/integration.yaml @@ -191,7 +191,7 @@ - 'integration-zuul-layoutdiff' - 'integration-zuul-layoutvalidation' - 'integration-zuul-layoutvalidation-gate' - - '{name}-puppet-validate' + - '{name}-rake-jessie' - '{name}-tox-jessie' - '{name}-tox-{toxenv}-jessie': toxenv: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 98bd66a..8424c93 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1299,15 +1299,15 @@ check: - noop test: + - integration-config-rake-jessie - integration-config-tox-jessie - - integration-config-puppet-validate - integration-config-tox-dib-jessie - integration-jjb-config-diff - integration-zuul-layoutdiff - integration-zuul-layoutvalidation gate-and-submit: + - integration-config-rake-jessie - integration-config-tox-jessie - - integration-config-puppet-validate - integration-config-tox-dib-jessie - integration-jjb-config-diff - integration-zuul-layoutvalidation-gate -- To view, visit https://gerrit.wikimedia.org/r/338746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I608d01656f5bc56e45dacb681d248ca315b546fd Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
