Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/300790
Change subject: Fix debian-glue by working around it's exported path for where debs are saved ...................................................................... Fix debian-glue by working around it's exported path for where debs are saved This will allow us to copy over the debs we created to our workspace. This is a workaround but will allow us to build deps for zuul :) Change-Id: Icd2b81805a6173f967a51d705be715b2521175b7 --- M jjb/operations-debs.yaml 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/90/300790/1 diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml index efc6090..9a44b37 100644 --- a/jjb/operations-debs.yaml +++ b/jjb/operations-debs.yaml @@ -109,6 +109,30 @@ disable: true builders: - shell: | + # Workaround the path not being correctly exported. + # This makes sure we doint copy any prevous zuul versions + # we built. + export distributions=$(dpkg-parsechangelog --show-field distribution -lsource/debian/changelog) + export DISTS=$distributions + if [ "$DISTS" = "precise-wikimedia" ] + then + if ls /mnt/pbuilder/result/precise-amd64/zuul_* 1> /dev/null 2>&1; then + sudo rm -rf /mnt/pbuilder/result/precise-amd64/zuul_* + fi + fi + if [ "$DISTS" = "trusty-wikimedia" ] + then + if ls /mnt/pbuilder/result/trusty-amd64/zuul_* 1> /dev/null 2>&1; then + sudo rm -rf /mnt/pbuilder/result/trusty-amd64/zuul_* + fi + fi + if [ "$DISTS" = "jessie-wikimedia" ] + then + if ls /mnt/pbuilder/result/jessie-amd64/zuul_* 1> /dev/null 2>&1; then + sudo rm -rf /mnt/pbuilder/result/jessie-amd64/zuul_* + fi + fi + - shell: | # GIT_BRANCH is set to 'detached' :-( export GIT_BRANCH="$ZUUL_REF" if [ "$ZUUL_PIPELINE" == "gate-and-submit" ]; then @@ -135,6 +159,22 @@ export COWBUILDER_BASE="$BASEPATH" /usr/bin/build-and-provide-package + - shell: | + # Workaround the path not being correctly exported. + export distributions=$(dpkg-parsechangelog --show-field distribution -lsource/debian/changelog) + export DISTS=$distributions + if [ "$DISTS" = "precise-wikimedia" ] + then + cp /mnt/pbuilder/result/precise-amd64/zuul_* "$WORKSPACE" + fi + if [ "$DISTS" = "trusty-wikimedia" ] + then + cp /mnt/pbuilder/result/trusty-amd64/zuul_* "$WORKSPACE" + fi + if [ "$DISTS" = "jessie-wikimedia" ] + then + cp /mnt/pbuilder/result/jessie-amd64/zuul_* "$WORKSPACE" + fi - debian-glue-lintian - debian-glue-piuparts publishers: *debian-glue-publishers -- To view, visit https://gerrit.wikimedia.org/r/300790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd2b81805a6173f967a51d705be715b2521175b7 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits