jenkins-bot has submitted this change and it was merged.
Change subject: debian-glue can now use a different distribution
......................................................................
debian-glue can now use a different distribution
Pass $distribution to build-and-provide-package, let us change the
cowbuilder distribution as needed.
Bug: T89959
Change-Id: Id28b02e8e1f50c2f51ec52f9fcf90200fdfc4774
---
M jjb/labs.yaml
M jjb/mediawiki-misc.yaml
M jjb/operations-debs.yaml
M jjb/parsoidsvc.yaml
4 files changed, 36 insertions(+), 17 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index 5dd62b7..530de90 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -18,7 +18,8 @@
- project:
name: 'labs-toollabs'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- '{name}-phplint'
- '{name}-jslint'
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index ca339e6..a5aba38 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -62,7 +62,8 @@
# mediawiki/services/mathoid.git
name: 'mathoidsvc'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'mediawiki-vagrant'
diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index b485dac..1c140d8 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -20,6 +20,7 @@
name: debian-glue-build-and-provide-package
builders:
- shell: |
+ export distribution={distribution}
export REPOSITORY=/data/project/debianrepo
export REPOS=jenkins-debian-glue
/usr/bin/build-and-provide-package
@@ -59,6 +60,7 @@
- job-template:
name: '{name}-debian-glue'
+ #name: '{name}-debian-glue-{distribution}'
defaults: use-remote-zuul
node: contintLabsSlave && UbuntuTrusty
concurrent: true
@@ -76,7 +78,8 @@
builders:
- debian-glue-generate-git-snapshot
- - debian-glue-build-and-provide-package
+ - debian-glue-build-and-provide-package:
+ distribution: '{distribution}'
- debian-glue-lintian
- debian-glue-piuparts
@@ -109,7 +112,8 @@
- project:
name: gerrit
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'lucene-search-2'
@@ -124,27 +128,32 @@
- project:
name: 'operations-debs-apertium-apy'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-archiva'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-gerrit'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-git-fat'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-ganglia'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-ircecho'
@@ -154,17 +163,20 @@
- project:
name: 'operations-debs-jenkins-debian-glue'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-kafka'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-latexml'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: operations-debs-pybal
@@ -172,21 +184,25 @@
- py27
- flake8
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- '{name}-tox-{toxenv}'
- project:
name: 'operations-debs-varnish'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-vips'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- project:
name: 'operations-debs-wikistats'
jobs:
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- '{name}-phplint'
diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 1e113a1..3a4d68e 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -178,7 +178,8 @@
- deploy # mediawiki/services/parsoid/deploy
jobs:
- 'parsoidsvc-jslint'
- - '{name}-debian-glue'
+ - '{name}-debian-glue':
+ distribution: trusty
- 'parsoidsvc-{repository}-parse-tool-check'
- 'parsoidsvc-{repository}-roundtrip-test-check'
- 'parsoidsvc-{repository}-npm-0.8'
--
To view, visit https://gerrit.wikimedia.org/r/191676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id28b02e8e1f50c2f51ec52f9fcf90200fdfc4774
Gerrit-PatchSet: 1
Gerrit-Project: integration/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
