jenkins-bot has submitted this change and it was merged.

Change subject: Generic debian-glue
......................................................................


Generic debian-glue

Creates debian-glue

Always end up selection jessie as the cowbuilder image ...

When checking out a reference, the Jenkins Git plugin set GIT_BRANCH to
detached.  That causes an issue in debian-glue 0.13.0, work around it by
using a local branch named ZUUL_REF and overriding GIT_BRANCH.

Set the distribution from debian/changelog

Change-Id: Id1f86648eaf2704338d89b365144d5ca06dc4a61
---
M jjb/operations-debs.yaml
1 file changed, 45 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index ff5e0e7..d1347be 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -70,7 +70,7 @@
       - debian-glue-lintian
       - debian-glue-piuparts
 
-    publishers:
+    publishers: &debian-glue-publishers
       - junit:
           results: 'lintian-*.xml'
       - tap:
@@ -78,6 +78,50 @@
       - archive:
           artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,lintian-*.txt,lintian-*.xml,piuparts.txt,piuparts.tap'
 
+- job-template:
+    name: 'debian-glue'
+    defaults: use-remoteonly-zuul
+    node: DebianGlue && DebianJessie
+    concurrent: false
+    triggers:
+        - zuul
+
+    scm:
+     - git:
+        url: '$ZUUL_URL/$ZUUL_PROJECT'
+        branches:
+         - '$ZUUL_COMMIT'
+        refspec: '$ZUUL_REF'
+        # Git plugin would set GIT_BRANCH=detached which confuses debian glue
+        # Will override it as a workaround
+        local-branch: $ZUUL_REF
+        basedir: 'source'
+        wipe-workspace: true
+        shallow-clone: true
+        submodule:
+            disable: true
+    builders:
+        - shell: |
+            # GIT_BRANCH is set to 'detached' :-(
+            export GIT_BRANCH="$ZUUL_REF"
+            /usr/bin/generate-git-snapshot
+        - shell: |
+            # Skip repository setup
+            export BUILD_ONLY=yes
+
+            export distribution=$(dpkg-parsechangelog --show-field 
distribution -lsource/debian/changelog)
+            echo "Distribution set from debian/changelog to $distribution"
+
+            /usr/bin/build-and-provide-package
+        - debian-glue-lintian
+        - debian-glue-piuparts
+    publishers: *debian-glue-publishers
+
+- project:
+    name: 'debian-glue'
+    jobs:
+        - 'debian-glue'
+
 #
 # PROJECTS
 #

-- 
To view, visit https://gerrit.wikimedia.org/r/226911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1f86648eaf2704338d89b365144d5ca06dc4a61
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to