jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338752 )
Change subject: debian-glue: only lintian against *.changes
......................................................................
debian-glue: only lintian against *.changes
We had the lintian utility running on the binary package via *.dsc as
well as against the source package via *.changes. That is redundant,
the source one being a superset.
The reason is that upstream jenkins-debian-glue examples decouple the
source and binary packages builds in two jobs when our setup has
everything in the same job.
Run lintian solely againt *.changes
Change file names to lintian.{txt,xml}
Adjust Jenkins artifacts archiving and junit report to match the new
filenames.
Also dump the content of lintian.txt since we default to showing the
console.
Update:
debian-glue
debian-glue-non-voting
Bug: T158553
Change-Id: Ic672ac72eb0fe0aa9f2efe95f6898efa6c48922f
---
M jjb/operations-debs.yaml
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index 5f272e7..aaeaf07 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -21,11 +21,10 @@
- shell: |
# We might consider adding --warnings
set -o pipefail
- # Source package:
- /usr/bin/lintian-junit-report --filename lintian-binary.txt *.dsc |
tee lintian-binary.xml
- # Binary package:
- /usr/bin/lintian-junit-report --filename lintian-source.txt
*.changes | tee lintian-source.xml
+ /usr/bin/lintian-junit-report --filename lintian.txt *.changes >
lintian.xml
set +o pipefail
+ # For human consumption when looking at the build console
+ cat lintian.txt
# Piuparts test installation / removal of a package
#
@@ -172,13 +171,13 @@
failure: 0
types:
- junit:
- pattern: 'lintian-*.xml'
+ pattern: 'lintian.xml'
# FIXME should convert UNSTABLE to FAILED.
# FIXME disabled due to T141454 T148664
#- tap:
# results: piuparts.tap
- archive:
- artifacts:
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,lintian-*.txt,lintian-*.xml,piuparts.txt,piuparts.tap'
+ artifacts:
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
- job-template:
!!merge : *job_template_debian_glue
--
To view, visit https://gerrit.wikimedia.org/r/338752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic672ac72eb0fe0aa9f2efe95f6898efa6c48922f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
