Hello Paladox,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/300830
to review the following change.
Change subject: package_builder: do not override BUILDRESULT
......................................................................
package_builder: do not override BUILDRESULT
When building packages on Jenkins with jenkins-debian-glue, it invokes
cowbuilder with --buildresult to have the binaries packages to be
written in the job workspace ($WORKSPACE/binaries).
Due to our pbuilder configuration, the path is overriden and pbuilder
ends up being invoked with a buildresult set to base_dir/result. That
prevents the job from easily capturing the .deb or running
piuparts/lintian.
Adjust pbuilderrc so it does not set BUILDRESULT when already set.
Bug: T141246
Signed-off-by: paladox <[email protected]>
Change-Id: If4649bbf445c030f125dd8eb7c1aa4e3dbb5f8ec
---
M modules/package_builder/templates/pbuilderrc.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/300830/1
diff --git a/modules/package_builder/templates/pbuilderrc.erb
b/modules/package_builder/templates/pbuilderrc.erb
index 0177b03..b1dbd41 100644
--- a/modules/package_builder/templates/pbuilderrc.erb
+++ b/modules/package_builder/templates/pbuilderrc.erb
@@ -18,7 +18,7 @@
DISTRIBUTION="$DIST"
PDEBUILD_PBUILDER="cowbuilder"
BASEPATH="<%= @basepath %>/base-${DIST}-${ARCH}.cow/"
-BUILDRESULT="<%= @basepath %>/result/${DIST}-${ARCH}"
+BUILDRESULT=${BUILDRESULT%-<%= @basepath %>/result/${DIST}-${ARCH}}
if [ "${APT_USE_BUILT}" = "yes" -a -d ${BUILDRESULT} ]; then
export BUILDRESULT # .deb location needs to be passed to D05localsources
--
To view, visit https://gerrit.wikimedia.org/r/300830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4649bbf445c030f125dd8eb7c1aa4e3dbb5f8ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
