jenkins-bot has submitted this change and it was merged.
Change subject: Replace puppet-validate job with pplint-HEAD
......................................................................
Replace puppet-validate job with pplint-HEAD
The operations-puppet-validate job ends up parsing all manifests and use
a rakefile which is not very safe (though we have a workaround).
Additionally it could only run on gallium which is a slowdown.
Instead switch to the pplint-HEAD template that looks for .pp files
changed in HEAD and xargs them to puppet parser validate.
Change-Id: Ie3ab603f01b383b5224f056a3ec11bfd5f92781e
---
M operations-puppet.yaml
1 file changed, 1 insertion(+), 31 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index b3fde51..355c3f1 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -1,33 +1,3 @@
-- job-template:
- name: 'operations-puppet-validate'
- node: gallium # relies on /srv/ssd/zuul/git/operations/puppet
- defaults: use-remote-zuul-no-submodules
- concurrent: true
-
- triggers:
- - zuul
-
- builders:
- # Run rake validate if and only if rakefile has NOT been altered
- # by the submitted patchset.
- - shell: |
- #!/bin/bash -e
-
- # Zuul merge changes in the branch which is then known is the
- # job workspace as origin/branch. So we have to look up the sha1
- # of the original branch by querying the Zuul maintained repo
- ORIG_HEAD=`git --git-dir=/srv/ssd/zuul/git/operations/puppet/.git
rev-parse "origin/$ZUUL_BRANCH"`
- echo "Original HEAD origin/$ZUUL_BRANCH points to $ORIG_HEAD"
-
- echo "Finding out whether the rakefile has been altered.."
- ( # exit 0 if rakefile got changed
- git diff --name-only "$ORIG_HEAD"..HEAD |grep rakefile>/dev/null
- ) && (
- echo "SKIPPING puppet validation: rakefile has been changed"
- ) || (
- rake --rakefile rakefile validate color=true
- )
-
# Run rspec
- job-template:
name: 'operations-puppet-spec'
@@ -120,11 +90,11 @@
- data_admin_lint
jobs:
- '{name}-erblint-HEAD'
+ - '{name}-pplint-HEAD'
- '{name}-puppetlint-lenient'
- '{name}-puppetlint-strict'
- '{name}-tox-{toxenv}'
- operations-puppet-typos
- - operations-puppet-validate
- operations-puppet-spec
- operations-puppet-test
- operations-puppet-doc
--
To view, visit https://gerrit.wikimedia.org/r/142222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3ab603f01b383b5224f056a3ec11bfd5f92781e
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-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
