[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405889 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot 
refs/changes/89/405889/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/405889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/ZppixBot
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Jenkins test (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405890 )

Change subject: Jenkins test (DO NOT SUBMIT)
..

Jenkins test (DO NOT SUBMIT)

Change-Id: If9cbee8d6d27c5df24670d8d349e61356ed06faf
---
A foobar.php
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot 
refs/changes/90/405890/1

diff --git a/foobar.php b/foobar.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/foobar.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9cbee8d6d27c5df24670d8d349e61356ed06faf
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/ZppixBot
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Use shallow clone for phplint jobs

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405722 )

Change subject: Use shallow clone for phplint jobs
..

Use shallow clone for phplint jobs

Bug: T179963
Change-Id: I1927c3e4497b790b90f3515eb730eb09b1d62d46
---
M jjb/job-templates.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/22/405722/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index d125f11..2402879 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -303,7 +303,7 @@
 - job-template:
 name: '{name}-{phpflavor}lint'
 node: contintLabsSlave && DebianJessie
-defaults: use-remote-zuul-no-submodules
+defaults: use-remote-zuul-shallow-clone
 concurrent: true
 properties:
  - build-discarder:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1927c3e4497b790b90f3515eb730eb09b1d62d46
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate visualeditor-coverage to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404646 )

Change subject: Migrate visualeditor-coverage to Docker
..

Migrate visualeditor-coverage to Docker

Tested on https://gerrit.wikimedia.org/r/#/c/404597/

Change-Id: I3eb069feb22956b1b1d1a75d60509e842342c2ee
---
M jjb/misc.yaml
1 file changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/46/404646/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 933dbd5..ed5bfa1 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -253,19 +253,23 @@
 
 - job:
 name: 'visualeditor-coverage'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- - npm
+ - docker-castor-load
+ - docker-src-dir
+ - docker-log-dir
+ - docker-ci-src-setup-simple
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/npm-browser-test:0.1.0'
+ logdir: '/log'
  - cover-publish:
-src: 'coverage'
+src: 'src/coverage'
 dest: 'visualeditor'
 publishers:
- - castor-save
+ - castor-save-workspace-cache
 
 - project:
 name: visualeditor

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb069feb22956b1b1d1a75d60509e842342c2ee
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate oojs-core-publish oojs-core-coverage to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404645 )

Change subject: Migrate oojs-core-publish oojs-core-coverage to Docker
..

Migrate oojs-core-publish oojs-core-coverage to Docker

Same as unicodejs done previously.

Change-Id: Id28553f85064f135ed2078a6fc970f747f41c26d
---
M jjb/misc.yaml
1 file changed, 21 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/45/404645/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 3b029dc..933dbd5 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -142,37 +142,44 @@
 
 - job:
 name: 'oojs-core-publish'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- - npm-install
- - npm-run:
- script: doc
+ - docker-castor-load
+ - docker-src-dir
+ - docker-log-dir
+ - docker-ci-src-setup-simple
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/npm-test:0.2.0'
+ logdir: '/log'
+ run_args: ' doc'
  - doc-publish:
-docsrc: 'docs'
+docsrc: 'src/docs'
 docdest: 'oojs/$DOC_SUBPATH'
 publishers:
- - castor-save
+ - castor-save-workspace-cache
 
 - job:
 name: 'oojs-core-coverage'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- - npm
+ - docker-castor-load
+ - docker-src-dir
+ - docker-log-dir
+ - docker-ci-src-setup-simple
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/npm-browser-test:0.1.0'
+ logdir: '/log'
  - cover-publish:
-src: 'coverage'
+src: 'src/coverage'
 dest: 'oojs'
 publishers:
- - castor-save
+ - castor-save-workspace-cache
 
 - job:
 name: 'oojs-ui-jsduck-publish'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id28553f85064f135ed2078a6fc970f747f41c26d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate unicodejs-coverage to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404644 )

Change subject: Migrate unicodejs-coverage to Docker
..

Migrate unicodejs-coverage to Docker

Change-Id: I1a3c5e4314e2faf039aae9411995ff5c5cc4bd70
---
M jjb/misc.yaml
1 file changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/44/404644/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index c4da7e1..e1e3a28 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -100,19 +100,23 @@
 
 - job:
 name: 'unicodejs-coverage'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- - npm
+ - docker-castor-load
+ - docker-src-dir
+ - docker-log-dir
+ - docker-ci-src-setup-simple
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/npm-test:0.2.0'
+ logdir: '/log'
  - cover-publish:
-src: 'coverage'
+src: 'src/coverage'
 dest: 'unicodejs'
 publishers:
- - castor-save
+ - castor-save-workspace-cache
 
 - project:
 name: eventlogging

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a3c5e4314e2faf039aae9411995ff5c5cc4bd70
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate unicodejs publish jobs to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404643 )

Change subject: Migrate unicodejs publish jobs to Docker
..

Migrate unicodejs publish jobs to Docker

Update:
unicodejs-publish
unicodejs-tag-publish

Tested on https://gerrit.wikimedia.org/r/#/c/401645/

Change-Id: If1842575ae270a91e6d584cba1212342c34ff04a
---
M jjb/misc.yaml
1 file changed, 21 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/43/404643/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 845dea0..c4da7e1 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -59,36 +59,43 @@
 
 - job:
 name: 'unicodejs-publish'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- - npm-install
- - npm-run:
- script: doc
+ - docker-castor-load
+ - docker-src-dir
+ - docker-log-dir
+ - docker-ci-src-setup-simple
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/npm-test:0.2.0'
+ logdir: '/log'
+ run_args: ' doc'
  - doc-publish:
-docsrc: 'docs'
+docsrc: 'src/docs'
 docdest: 'unicodejs/$DOC_SUBPATH'
 publishers:
- - castor-save
+ - castor-save-workspace-cache
 
 - job:
 name: 'unicodejs-tag-publish'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul-post
 builders:
  # No cache restore/save (castor) for tags
- - npm-install
- - npm-run:
- script: doc
+ - docker-castor-load
+ - docker-src-dir
+ - docker-log-dir
+ - docker-ci-src-setup-simple
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/npm-test:0.2.0'
+ logdir: '/log'
+ run_args: ' doc'
  - doc-publish:
-docsrc: 'docs'
+docsrc: 'src/docs'
 docdest: 'unicodejs/$DOC_SUBPATH'
 
 - job:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1842575ae270a91e6d584cba1212342c34ff04a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix path in oojs-ui-doxygen-publish

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404485 )

Change subject: Fix path in oojs-ui-doxygen-publish
..


Fix path in oojs-ui-doxygen-publish

Change-Id: I61fa9f0a613ff2c1f0271f9b739f4419047c2347
---
M jjb/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index c9ebdff..845dea0 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -210,7 +210,7 @@
  image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
-docsrc: 'doc/html'
+docsrc: 'src/doc/html'
 docdest: 'oojs-ui/$DOC_SUBPATH/php'
 archive:
  - archive-log-allow-empty

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61fa9f0a613ff2c1f0271f9b739f4419047c2347
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix path in oojs-ui-doxygen-publish

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404485 )

Change subject: Fix path in oojs-ui-doxygen-publish
..

Fix path in oojs-ui-doxygen-publish

Change-Id: I61fa9f0a613ff2c1f0271f9b739f4419047c2347
---
M jjb/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/85/404485/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index c9ebdff..845dea0 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -210,7 +210,7 @@
  image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
-docsrc: 'doc/html'
+docsrc: 'src/doc/html'
 docdest: 'oojs-ui/$DOC_SUBPATH/php'
 archive:
  - archive-log-allow-empty

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61fa9f0a613ff2c1f0271f9b739f4419047c2347
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add PHP to doxygen image

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404483 )

Change subject: Add PHP to doxygen image
..


Add PHP to doxygen image

Typically used for filters.

Update:
doxygen-publish
mwext-doxygen-publish
oojs-ui-doxygen-publish

Change-Id: Iedf328e8e16292e0bc22362441f46de1b66335e1
---
M dockerfiles/doxygen/Dockerfile.template
M dockerfiles/doxygen/changelog
M dockerfiles/doxygen/example-run.sh
M jjb/mediawiki-extensions.yaml
M jjb/misc.yaml
5 files changed, 12 insertions(+), 5 deletions(-)



diff --git a/dockerfiles/doxygen/Dockerfile.template 
b/dockerfiles/doxygen/Dockerfile.template
index 49b7db5..9d1f21f 100644
--- a/dockerfiles/doxygen/Dockerfile.template
+++ b/dockerfiles/doxygen/Dockerfile.template
@@ -1,6 +1,7 @@
 FROM {{ "ci-jessie" | image_tag }}
 
-RUN {{ "doxygen graphviz" | apt_install }}
+# php is for filters
+RUN {{ "doxygen graphviz php5-cli" | apt_install }}
 
 COPY run.sh /run.sh
 
diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog
index b461105..b36d0ed 100644
--- a/dockerfiles/doxygen/changelog
+++ b/dockerfiles/doxygen/changelog
@@ -1,3 +1,9 @@
+doxygen (0.3.0) wikimedia; urgency=medium
+
+  * Add php-cli for filters.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 17:00:07 +0100
+
 doxygen (0.2.0) wikimedia; urgency=medium
 
   * Make the container clone the repository.
diff --git a/dockerfiles/doxygen/example-run.sh 
b/dockerfiles/doxygen/example-run.sh
index 961410c..9cc2625 100755
--- a/dockerfiles/doxygen/example-run.sh
+++ b/dockerfiles/doxygen/example-run.sh
@@ -20,7 +20,7 @@
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
 -e ZUUL_URL=https://gerrit.wikimedia.org/r/ \
--e ZUUL_PROJECT=mediawiki/oauthclient-php \
+-e ZUUL_PROJECT=oojs/ui \
 -e ZUUL_REF=master \
 docker-registry.wikimedia.org/releng/doxygen:latest
 
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 1452068..4adb81d 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -346,7 +346,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'src/docs/php'
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 0a27682..c9ebdff 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -12,7 +12,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'src/doc/html'
@@ -207,7 +207,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'doc/html'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf328e8e16292e0bc22362441f46de1b66335e1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add PHP to doxygen image

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404483 )

Change subject: Add PHP to doxygen image
..

Add PHP to doxygen image

Typically used for filters.

Update:
doxygen-publish
mwext-doxygen-publish
oojs-ui-doxygen-publish

Change-Id: Iedf328e8e16292e0bc22362441f46de1b66335e1
---
M dockerfiles/doxygen/Dockerfile.template
M dockerfiles/doxygen/changelog
M dockerfiles/doxygen/example-run.sh
M jjb/mediawiki-extensions.yaml
M jjb/misc.yaml
5 files changed, 12 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/83/404483/1

diff --git a/dockerfiles/doxygen/Dockerfile.template 
b/dockerfiles/doxygen/Dockerfile.template
index 49b7db5..9d1f21f 100644
--- a/dockerfiles/doxygen/Dockerfile.template
+++ b/dockerfiles/doxygen/Dockerfile.template
@@ -1,6 +1,7 @@
 FROM {{ "ci-jessie" | image_tag }}
 
-RUN {{ "doxygen graphviz" | apt_install }}
+# php is for filters
+RUN {{ "doxygen graphviz php5-cli" | apt_install }}
 
 COPY run.sh /run.sh
 
diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog
index b461105..b36d0ed 100644
--- a/dockerfiles/doxygen/changelog
+++ b/dockerfiles/doxygen/changelog
@@ -1,3 +1,9 @@
+doxygen (0.3.0) wikimedia; urgency=medium
+
+  * Add php-cli for filters.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 17:00:07 +0100
+
 doxygen (0.2.0) wikimedia; urgency=medium
 
   * Make the container clone the repository.
diff --git a/dockerfiles/doxygen/example-run.sh 
b/dockerfiles/doxygen/example-run.sh
index 961410c..9cc2625 100755
--- a/dockerfiles/doxygen/example-run.sh
+++ b/dockerfiles/doxygen/example-run.sh
@@ -20,7 +20,7 @@
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
 -e ZUUL_URL=https://gerrit.wikimedia.org/r/ \
--e ZUUL_PROJECT=mediawiki/oauthclient-php \
+-e ZUUL_PROJECT=oojs/ui \
 -e ZUUL_REF=master \
 docker-registry.wikimedia.org/releng/doxygen:latest
 
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 1452068..4adb81d 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -346,7 +346,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'src/docs/php'
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 0a27682..c9ebdff 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -12,7 +12,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'src/doc/html'
@@ -207,7 +207,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'doc/html'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf328e8e16292e0bc22362441f46de1b66335e1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix doxygen container not cloning repo

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404475 )

Change subject: Fix doxygen container not cloning repo
..

Fix doxygen container not cloning repo

Update:
doxygen-publish
mwext-doxygen-publish
oojs-ui-doxygen-publish

Change-Id: I72876738d3c171b2c923da5ef6ac5d946222bb36
---
M dockerfiles/doxygen/Dockerfile.template
M dockerfiles/doxygen/changelog
M dockerfiles/doxygen/example-run.sh
M dockerfiles/doxygen/run.sh
M jjb/mediawiki-extensions.yaml
M jjb/misc.yaml
6 files changed, 21 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/75/404475/1

diff --git a/dockerfiles/doxygen/Dockerfile.template 
b/dockerfiles/doxygen/Dockerfile.template
index a7a16c1..49b7db5 100644
--- a/dockerfiles/doxygen/Dockerfile.template
+++ b/dockerfiles/doxygen/Dockerfile.template
@@ -4,4 +4,5 @@
 
 COPY run.sh /run.sh
 
+USER nobody
 ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog
index 78c..b461105 100644
--- a/dockerfiles/doxygen/changelog
+++ b/dockerfiles/doxygen/changelog
@@ -1,3 +1,10 @@
+doxygen (0.2.0) wikimedia; urgency=medium
+
+  * Make the container clone the repository.
+  * Run entrypoint as nobody
+
+ -- Antoine Musso   Tue, 16 Jan 2018 16:41:43 +0100
+
 doxygen (0.1.0) wikimedia; urgency=medium
 
   * Initial creation. Based on Jessie.
diff --git a/dockerfiles/doxygen/example-run.sh 
b/dockerfiles/doxygen/example-run.sh
index 568c0af..961410c 100755
--- a/dockerfiles/doxygen/example-run.sh
+++ b/dockerfiles/doxygen/example-run.sh
@@ -6,12 +6,6 @@
 mkdir -m 777 -p src
 mkdir -m 777 -p cache
 
-(cd src
- git init
- git fetch --quiet --depth 1 
"https://gerrit.wikimedia.org/r/mediawiki/oauthclient-php;
- git checkout FETCH_HEAD
-)
-
 echo "Cleaning generated documentation in /src/doc"
 docker run \
 --rm --tty \
@@ -25,6 +19,9 @@
 --volume /"$(pwd)"/log://var/lib/jenkins/log \
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
+-e ZUUL_URL=https://gerrit.wikimedia.org/r/ \
+-e ZUUL_PROJECT=mediawiki/oauthclient-php \
+-e ZUUL_REF=master \
 docker-registry.wikimedia.org/releng/doxygen:latest
 
 set +x
diff --git a/dockerfiles/doxygen/run.sh b/dockerfiles/doxygen/run.sh
index 657bc64..1515410 100755
--- a/dockerfiles/doxygen/run.sh
+++ b/dockerfiles/doxygen/run.sh
@@ -4,6 +4,12 @@
 
 set -euxo pipefail
 
-doxygen --version
 cd /src
+
+git init
+git fetch --depth 2 --quiet "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout --quiet FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+doxygen --version
 exec doxygen
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 5d33fc3..1452068 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -346,7 +346,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'src/docs/php'
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index eca3d22..0a27682 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -12,7 +12,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'src/doc/html'
@@ -207,7 +207,7 @@
  - docker-log-dir
  - docker-src-dir
  - docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
  logdir: '/log'
  - doc-publish:
 docsrc: 'doc/html'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72876738d3c171b2c923da5ef6ac5d946222bb36
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate most Doxygen jobs to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404470 )

Change subject: Migrate most Doxygen jobs to Docker
..

Migrate most Doxygen jobs to Docker

Still on Jessie few.
Also archive /log if there are files in it.

Update:
doxygen-publish
mwext-doxygen-publish
oojs-ui-doxygen-publish

Change-Id: Ib0ccfc63109708c99cc0ac6da289c5ee73355af7
---
A dockerfiles/doxygen/.dockerignore
A dockerfiles/doxygen/.gitignore
A dockerfiles/doxygen/Dockerfile.template
A dockerfiles/doxygen/changelog
A dockerfiles/doxygen/control
A dockerfiles/doxygen/example-run.sh
A dockerfiles/doxygen/run.sh
M jjb/mediawiki-extensions.yaml
M jjb/misc.yaml
9 files changed, 90 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/70/404470/1

diff --git a/dockerfiles/doxygen/.dockerignore 
b/dockerfiles/doxygen/.dockerignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/doxygen/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/doxygen/.gitignore b/dockerfiles/doxygen/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/doxygen/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/doxygen/Dockerfile.template 
b/dockerfiles/doxygen/Dockerfile.template
new file mode 100644
index 000..a7a16c1
--- /dev/null
+++ b/dockerfiles/doxygen/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+RUN {{ "doxygen graphviz" | apt_install }}
+
+COPY run.sh /run.sh
+
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog
new file mode 100644
index 000..78c
--- /dev/null
+++ b/dockerfiles/doxygen/changelog
@@ -0,0 +1,5 @@
+doxygen (0.1.0) wikimedia; urgency=medium
+
+  * Initial creation. Based on Jessie.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 15:53:04 +0100
diff --git a/dockerfiles/doxygen/control b/dockerfiles/doxygen/control
new file mode 100644
index 000..8c6d9e3
--- /dev/null
+++ b/dockerfiles/doxygen/control
@@ -0,0 +1 @@
+Depends: ci-jessie
diff --git a/dockerfiles/doxygen/example-run.sh 
b/dockerfiles/doxygen/example-run.sh
new file mode 100755
index 000..568c0af
--- /dev/null
+++ b/dockerfiles/doxygen/example-run.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -eux -o pipefail
+
+mkdir -m 777 -p log
+mkdir -m 777 -p src
+mkdir -m 777 -p cache
+
+(cd src
+ git init
+ git fetch --quiet --depth 1 
"https://gerrit.wikimedia.org/r/mediawiki/oauthclient-php;
+ git checkout FETCH_HEAD
+)
+
+echo "Cleaning generated documentation in /src/doc"
+docker run \
+--rm --tty \
+--volume /"$(pwd)"/src://src \
+--entrypoint=/bin/rm \
+docker-registry.wikimedia.org/releng/doxygen:latest \
+-fR /src/doc
+
+docker run \
+--rm --tty \
+--volume /"$(pwd)"/log://var/lib/jenkins/log \
+--volume /"$(pwd)"/cache://cache \
+--volume /"$(pwd)"/src://src \
+docker-registry.wikimedia.org/releng/doxygen:latest
+
+set +x
+if [ -e src/doc/html/index.html ]; then
+echo "Doxygen documentation generated"
+else
+echo "Doxygen documentation has NOT been generated"
+exit 1
+fi
diff --git a/dockerfiles/doxygen/run.sh b/dockerfiles/doxygen/run.sh
new file mode 100755
index 000..657bc64
--- /dev/null
+++ b/dockerfiles/doxygen/run.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+umask 002
+
+set -euxo pipefail
+
+doxygen --version
+cd /src
+exec doxygen
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index eb21d51..5d33fc3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -338,16 +338,21 @@
 
 - job:
 name: 'mwext-doxygen-publish'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - shell: doxygen
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ logdir: '/log'
  - doc-publish:
-docsrc: 'docs/php'
+docsrc: 'src/docs/php'
 docdest: '$DOC_BASENAME/$DOC_SUBPATH/php'
+archive:
+ - archive-log-allow-empty
 
 # Phan! (T153039)
 - job:
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 1481291..eca3d22 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -4,16 +4,21 @@
 # matches the Git repository name.
 - job:
 name: 'doxygen-publish'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - shell: doxygen
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: docker-registry.wikimedia.org/releng/doxygen:0.1.0
+ logdir: '/log'
  - doc-publish:
-docsrc: 'doc/html'
+docsrc: 

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate tox publish jobs to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404448 )

Change subject: Migrate tox publish jobs to Docker
..

Migrate tox publish jobs to Docker

cumin-tox-publish
cumin-tox-tag-publish
mw-tools-releng-tox-publish
pywikibot-core-tox-publish

Change-Id: I3ba7c5e6369e04fc9815e2c61a235eec1650db07
---
M jjb/python-jobs.yaml
1 file changed, 16 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/48/404448/1

diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 66e377d..8c615c6 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -58,35 +58,38 @@
 # Intended for changes being merged, eg in 'postmerge'
 - job-template:
 name: '{name}-tox-publish'
-node: ci-jessie-wikimedia
-defaults: use-remoteonly-zuul
+node: DebianJessieDocker
 triggers:
  - zuul
 builders:
- - castor-load
- - run-tox:
- venv: '{obj:docenv|doc}'
+ - docker-castor-load
+ - docker-log-dir
+ - docker-run-with-log-and-workspace-cache:
+ image: 'docker-registry.wikimedia.org/releng/tox:0.1.0'
+ logdir: '/log'
+ run_args: ' -e "{obj:docenv|doc}"'
  - doc-publish:
-docsrc: '{docsrc}'
+docsrc: 'src/{docsrc}'
 docdest: '{docdest}'
-
 publishers:
- - castor-save
+ - castor-save-workspace-cache
  - archive-log-dir
 
 # Same but for ref-update, eg in 'publish'
 - job-template:
 name: '{name}-tox-tag-publish'
-node: ci-jessie-wikimedia
-defaults: use-remoteonly-zuul
+node: DebianJessieDocker
 triggers:
  - zuul-post
 builders:
 # No cache restore/save (castor) for tags
- - run-tox:
- venv: '{obj:docenv|doc}'
+ - docker-log-dir
+ - docker-run-with-log-and-workspace-cache:
+ image: 'docker-registry.wikimedia.org/releng/tox:0.1.0'
+ logdir: '/log'
+ run_args: ' -e "{obj:docenv|doc}"'
  - doc-publish:
-docsrc: '{docsrc}'
+docsrc: 'src/{docsrc}'
 docdest: '{docdest}'
 publishers:
  - archive-log-dir

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ba7c5e6369e04fc9815e2c61a235eec1650db07
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate yard-publish jobs to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404440 )

Change subject: Migrate yard-publish jobs to Docker
..

Migrate yard-publish jobs to Docker

mediawiki-ruby-api-bundle-yard-publish
mediawiki-selenium-bundle-yard-publish

Change-Id: I30be4882d5d7511644dcff212e77dc9ce788c4e8
---
M jjb/ruby-jobs.yaml
M zuul/parameter_functions.py
2 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/404440/1

diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 91eed20..446e5a8 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -44,19 +44,23 @@
 # doc.wikimedia.org using an intermediate rsync repository in labs.
 - job-template:
 name: '{name}-bundle-yard-publish'
-node: ci-jessie-wikimedia
-defaults: use-remoteonly-zuul
+node: DebianJessieDocker
 triggers:
  - zuul
 builders:
- - castor-load
- - bundle-nodepool:
- command: 'yard'
+ - docker-castor-load
+ - docker-log-dir
+ - docker-src-dir
+ - docker-run-with-log-cache-src:
+ image: 'docker-registry.wikimedia.org/releng/rake:0.2.0'
+ logdir: '/log'
+ run_args: ' yard'
  - doc-publish:
- docsrc: 'doc'
+ docsrc: 'src/doc'
  docdest: 'rubygems/{name}'
 publishers:
- - castor-save
+ - archive-log-allow-empty
+ - castor-save-workspace-cache
 
 # General MW-Selenium job used to dogfood the builder against MW core.
 - job:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index ecac95b..1155d75 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -98,10 +98,6 @@
 if job.name.endswith('-publish'):
 set_doc_variables(item, job, params)
 
-# Needs BUNDLE_PATH
-if job.name.endswith('yard-publish'):
-nodepool_params(item, job, params)
-
 if 'debian-glue' in job.name:
 
 # XXX

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30be4882d5d7511644dcff212e77dc9ce788c4e8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Remove mediawiki-vagrant-rake-jessie

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404432 )

Change subject: Remove mediawiki-vagrant-rake-jessie
..

Remove mediawiki-vagrant-rake-jessie

Migrated to Docker.

Change-Id: I2a8f10ee4b71f255c553600c328f9c16cc22af85
---
M jjb/mediawiki-misc.yaml
1 file changed, 0 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/404432/1

diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 23dc0b8..b3e199e 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -33,21 +33,6 @@
  - '{name}-bundle-yard-publish'
  - '{name}-rake-docker'
 
-# Run `bundle exec rake test` on Nodepool Jessie instances.
-- job:
-name: 'mediawiki-vagrant-rake-jessie'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
-concurrent: true
-triggers:
- - zuul
-builders:
- - castor-load
- - bundle-nodepool:
- command: rake test
-publishers:
- - castor-save
-
 - project:
 name: 'mediawiki-vagrant'
 jobs:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a8f10ee4b71f255c553600c328f9c16cc22af85
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: pass args to 'rake'

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404422 )

Change subject: docker: pass args to 'rake'
..

docker: pass args to 'rake'

Lets one override the default 'bundle exec rake test' by passing 'docker
run' arguements to rake.  Still defaults to 'test'.

Migrate rake jobs to the new images.

Change-Id: I32bae97eda249aa2308fb9b5bd322eb34a31faf5
---
M dockerfiles/rake-vagrant/changelog
M dockerfiles/rake/changelog
M dockerfiles/rake/run.sh
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
5 files changed, 16 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/22/404422/1

diff --git a/dockerfiles/rake-vagrant/changelog 
b/dockerfiles/rake-vagrant/changelog
index daf..d15244f 100644
--- a/dockerfiles/rake-vagrant/changelog
+++ b/dockerfiles/rake-vagrant/changelog
@@ -1,3 +1,10 @@
+rake-vagrant (0.2.1) wikimedia; urgency=medium
+
+  * Rebuild based on releng/rake/0.2.1:
+  > Pass docker run arguments to rake, default to test.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 09:54:29 +0100
+
 rake-vagrant (0.2.0) wikimedia; urgency=medium
 
   * Rebuild based on rake:0.1.1:
diff --git a/dockerfiles/rake/changelog b/dockerfiles/rake/changelog
index 627706c..87c546f 100644
--- a/dockerfiles/rake/changelog
+++ b/dockerfiles/rake/changelog
@@ -1,3 +1,9 @@
+rake (0.2.1) wikimedia; urgency=medium
+
+  * Pass docker run arguments to rake, default to test.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 09:54:29 +0100
+
 rake (0.2.0) wikimedia; urgency=medium
 
   * bundle install to $XDG_CACHE_HOME so the material can be cached between
diff --git a/dockerfiles/rake/run.sh b/dockerfiles/rake/run.sh
index 4d8e852..0140e67 100755
--- a/dockerfiles/rake/run.sh
+++ b/dockerfiles/rake/run.sh
@@ -12,4 +12,4 @@
 git submodule --quiet update --init --recursive
 
 bundle install --clean --path "${XDG_CACHE_HOME}/bundle"
-exec bundle exec rake test
+exec bundle exec rake "${@:-test}"
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index b555975..8460489 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -49,7 +49,7 @@
 name: 'mediawiki-vagrant'
 jobs:
  - '{name}-rake-docker':
- docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.0
+ docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1
  build_timeout: 10  # minutes
  - 'mediawiki-vagrant-puppet-doc-publish'
 
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 7af5fa4..91eed20 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -11,7 +11,7 @@
 name: 'rake-docker'
 node: DebianJessieDocker
 concurrent: true
-docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.0'
+docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.1'
 triggers:
 - zuul
 builders:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32bae97eda249aa2308fb9b5bd322eb34a31faf5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate vagrant doc publish job to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404421 )

Change subject: Migrate vagrant doc publish job to Docker
..

Migrate vagrant doc publish job to Docker

Change-Id: Ib10cec437a123c5590c3218877349b71e4b84fcb
---
M dockerfiles/rake-vagrant/changelog
M dockerfiles/rake/changelog
M dockerfiles/rake/run.sh
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
M zuul/parameter_functions.py
6 files changed, 25 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/21/404421/1

diff --git a/dockerfiles/rake-vagrant/changelog 
b/dockerfiles/rake-vagrant/changelog
index daf..d15244f 100644
--- a/dockerfiles/rake-vagrant/changelog
+++ b/dockerfiles/rake-vagrant/changelog
@@ -1,3 +1,10 @@
+rake-vagrant (0.2.1) wikimedia; urgency=medium
+
+  * Rebuild based on releng/rake/0.2.1:
+  > Pass docker run arguments to rake, default to test.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 09:54:29 +0100
+
 rake-vagrant (0.2.0) wikimedia; urgency=medium
 
   * Rebuild based on rake:0.1.1:
diff --git a/dockerfiles/rake/changelog b/dockerfiles/rake/changelog
index 627706c..87c546f 100644
--- a/dockerfiles/rake/changelog
+++ b/dockerfiles/rake/changelog
@@ -1,3 +1,9 @@
+rake (0.2.1) wikimedia; urgency=medium
+
+  * Pass docker run arguments to rake, default to test.
+
+ -- Antoine Musso   Tue, 16 Jan 2018 09:54:29 +0100
+
 rake (0.2.0) wikimedia; urgency=medium
 
   * bundle install to $XDG_CACHE_HOME so the material can be cached between
diff --git a/dockerfiles/rake/run.sh b/dockerfiles/rake/run.sh
index 4d8e852..0140e67 100755
--- a/dockerfiles/rake/run.sh
+++ b/dockerfiles/rake/run.sh
@@ -12,4 +12,4 @@
 git submodule --quiet update --init --recursive
 
 bundle install --clean --path "${XDG_CACHE_HOME}/bundle"
-exec bundle exec rake test
+exec bundle exec rake "${@:-test}"
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index b555975..289cf24 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -1,20 +1,22 @@
 - job-template:
 name: 'mediawiki-vagrant-puppet-doc-publish'
-node: ci-jessie-wikimedia
-defaults: use-remoteonly-zuul
+node: DebianJessieDocker
 concurrent: false
 triggers:
  - zuul
 builders:
- - castor-load
- # BUNDLE_PATH is injected by Zuul
- - bundle-nodepool:
- command: 'rake doc'
+ - docker-castor-load
+ - docker-log-dir
+ - docker-run-with-log-and-workspace-cache:
+ image: 'docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1'
+ logdir: '/log'
+ run_args: 'doc'
  - doc-publish:
 docsrc: 'doc'
 docdest: 'mediawiki-vagrant'
 publishers:
- - castor-save
+ - archive-log-allow-empty
+ - castor-save-workspace-cache
 
 - project:
 name: 'mediawiki-ruby-api'
@@ -49,7 +51,7 @@
 name: 'mediawiki-vagrant'
 jobs:
  - '{name}-rake-docker':
- docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.0
+ docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1
  build_timeout: 10  # minutes
  - 'mediawiki-vagrant-puppet-doc-publish'
 
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 7af5fa4..91eed20 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -11,7 +11,7 @@
 name: 'rake-docker'
 node: DebianJessieDocker
 concurrent: true
-docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.0'
+docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.1'
 triggers:
 - zuul
 builders:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2247bf6..ecac95b 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -101,8 +101,6 @@
 # Needs BUNDLE_PATH
 if job.name.endswith('yard-publish'):
 nodepool_params(item, job, params)
-if job.name == 'mediawiki-vagrant-puppet-doc-publish':
-nodepool_params(item, job, params)
 
 if 'debian-glue' in job.name:
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib10cec437a123c5590c3218877349b71e4b84fcb
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate mediawiki/vagrant to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404416 )

Change subject: Migrate mediawiki/vagrant to Docker
..

Migrate mediawiki/vagrant to Docker

It has been switched to stretch so we can now use Vagrant 1.9.1 in its
Gemfile (https://gerrit.wikimedia.org/r/#/c/404414/).

Change-Id: Ib8772f2cc244853e0d79410836ea38194eac813d
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/16/404416/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3a4cbdf..f2d9ee2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -766,7 +766,7 @@
   - '.*([Rr]akefile|/spec/)'
 
   # Same for mediawiki/vagrant
-  - name: ^mediawiki-vagrant-rake-(docker|jessie)$
+  - name: ^mediawiki-vagrant-rake-docker$
 files:
   - '.*'
   - name: ^puppet-wmf-styleguide-rake-docker$
@@ -2175,13 +2175,12 @@
 
   - name: mediawiki/vagrant
 test:
-  - mediawiki-vagrant-rake-jessie
+  - mediawiki-vagrant-rake-docker
 gate-and-submit:
-  - mediawiki-vagrant-rake-jessie
+  - mediawiki-vagrant-rake-docker
 postmerge:
   - mediawiki-vagrant-puppet-doc-publish
 experimental:
-  - mediawiki-vagrant-rake-docker
 
   - name: node-rdkafka-statsd
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8772f2cc244853e0d79410836ea38194eac813d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Bump Vagrant gem version to the one used in Stretch

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404414 )

Change subject: Bump Vagrant gem version to the one used in Stretch
..

Bump Vagrant gem version to the one used in Stretch

Debian stretch ships vagrant 1.9.1. Bump the tag from 1.8.1 to 1.9.1.

Change-Id: Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81
---
M Gemfile
M Gemfile.lock
2 files changed, 33 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/14/404414/1

diff --git a/Gemfile b/Gemfile
index 0e63da2..2e65b76 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
 group :development do
+  # The versions should be kept in sync with the ones provided in Debian
+
   # Upstream no more updates rubygems.org and we need a more recent version
   # https://github.com/mitchellh/vagrant/issues/5546
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.9.1'
   gem 'rubocop', '~> 0.51', require: false
   gem 'puppet', '~> 4.8.2'
   gem 'puppet-lint', '2.3.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3aa9f13..1b2af54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,25 +1,25 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: c1c00e2f3cf69c579a5aa6922d67bb838a2de9cd
-  tag: v1.8.1
+  revision: d8c2b2e5ababcdecc65b62b91e5dec21a4bc2d96
+  tag: v1.9.1
   specs:
-vagrant (1.8.1)
-  bundler (>= 1.5.2, <= 1.10.6)
+vagrant (1.9.1)
   childprocess (~> 0.5.0)
   erubis (~> 2.7.0)
   hashicorp-checkpoint (~> 0.1.1)
   i18n (>= 0.6.0, <= 0.8.0)
-  listen (~> 3.0.2)
+  listen (~> 3.1.5)
   log4r (~> 1.1.9, < 1.1.11)
   net-scp (~> 1.1.0)
   net-sftp (~> 2.1)
   net-ssh (~> 3.0.1)
-  nokogiri (= 1.6.3.1)
+  nokogiri (= 1.6.7.1)
   rb-kqueue (~> 0.2.0)
-  rest-client (>= 1.6.0, < 2.0)
+  rest-client (>= 1.6.0, < 3.0)
+  ruby_dep (<= 1.3.1)
   wdm (~> 0.1.0)
-  winrm (~> 1.3)
-  winrm-fs (~> 0.2.2)
+  winrm (~> 1.6)
+  winrm-fs (~> 0.3.0)
 
 PATH
   remote: .
@@ -66,18 +66,21 @@
 httpclient (2.8.3)
 i18n (0.8.0)
 json_pure (1.8.6)
-listen (3.0.8)
+listen (3.1.5)
   rb-fsevent (~> 0.9, >= 0.9.4)
   rb-inotify (~> 0.9, >= 0.9.7)
+  ruby_dep (~> 1.2)
 little-plugger (1.1.4)
 log4r (1.1.10)
-logging (1.8.2)
-  little-plugger (>= 1.1.3)
-  multi_json (>= 1.8.4)
+logging (2.2.2)
+  little-plugger (~> 1.1)
+  multi_json (~> 1.10)
 metaclass (0.0.4)
 method_source (0.9.0)
-mime-types (2.99.3)
-mini_portile (0.6.0)
+mime-types (3.1)
+  mime-types-data (~> 3.2015)
+mime-types-data (3.2016.0521)
+mini_portile2 (2.0.0)
 mocha (1.3.0)
   metaclass (~> 0.0.1)
 multi_json (1.12.2)
@@ -88,8 +91,8 @@
   net-ssh (>= 2.6.5)
 net-ssh (3.0.2)
 netrc (0.11.0)
-nokogiri (1.6.3.1)
-  mini_portile (= 0.6.0)
+nokogiri (1.6.7.1)
+  mini_portile2 (~> 2.0.0.rc2)
 nori (2.6.0)
 parallel (1.12.0)
 parser (2.4.0.2)
@@ -124,10 +127,10 @@
   ffi (>= 0.5.0, < 2)
 rb-kqueue (0.2.5)
   ffi (>= 0.5.0)
-rest-client (1.8.0)
+rest-client (2.0.2)
   http-cookie (>= 1.0.2, < 2.0)
-  mime-types (>= 1.16, < 3.0)
-  netrc (~> 0.7)
+  mime-types (>= 1.16, < 4.0)
+  netrc (~> 0.8)
 rspec (3.7.0)
   rspec-core (~> 3.7.0)
   rspec-expectations (~> 3.7.0)
@@ -151,29 +154,28 @@
   ruby-progressbar (~> 1.7)
   unicode-display_width (~> 1.0, >= 1.0.1)
 ruby-progressbar (1.9.0)
-rubyntlm (0.4.0)
+ruby_dep (1.3.1)
+rubyntlm (0.6.2)
 rubyzip (1.2.1)
 safe_yaml (1.0.4)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.4)
 unicode-display_width (1.3.0)
-uuidtools (2.1.5)
 wdm (0.1.1)
-winrm (1.3.6)
+winrm (1.8.1)
   builder (>= 2.1.2)
   gssapi (~> 1.2)
   gyoku (~> 1.0)
   httpclient (~> 2.2, >= 2.2.0.2)
   logging (>= 1.6.1, < 3.0)
   nori (~> 2.0)
-  rubyntlm (~> 0.4.0)
-  uuidtools (~> 2.1.2)
-winrm-fs (0.2.3)
+  rubyntlm (~> 0.6.0)
+winrm-fs (0.3.2)
   erubis (~> 2.7)
-  logging (~> 1.6, >= 1.6.1)
+  logging (>= 1.6.1, < 3.0)
   rubyzip (~> 1.1)
-  winrm (~> 1.3.0)
+  winrm (~> 1.5)
 yard (0.9.12)
 
 PLATFORMS

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] integration/config[master]: debian-glue: archive *.buildinfo

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404299 )

Change subject: debian-glue: archive *.buildinfo
..

debian-glue: archive *.buildinfo

It has a few nice informations and apparently dpkg-buildpackage in sid
includes them in the .changes files.

References:
https://github.com/mika/jenkins-debian-glue/issues/165
https://github.com/mika/jenkins-debian-glue/commit/e6373df6db82389a1a5bfa4017caa9a3efb284d5

Change-Id: I1a33e7e475f497cb59b7d338fa228e810242aeaf
---
M jjb/operations-debs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/99/404299/1

diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index daf68b8..1984581 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -185,7 +185,7 @@
   #- tap:
   #results: piuparts.tap
   - archive:
-  artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,debc.txt,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
+  artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.buildinfo,*.changes,debc.txt,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
 
 - job-template:
 !!merge : *job_template_debian_glue

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a33e7e475f497cb59b7d338fa228e810242aeaf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: voting debian-glue for php-ast

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404291 )

Change subject: voting debian-glue for php-ast
..

voting debian-glue for php-ast

Passed on https://gerrit.wikimedia.org/r/#/c/404283/

Change-Id: I0eb4f0ac4b8ddc4dbac03ffac4da6460e51a2e6e
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/91/404291/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1ec7929..005a664 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2275,7 +2275,11 @@
   - { name: operations/debs/phantomjs,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/php-mailparse,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php,  test: 
['debian-glue-non-voting'] }
-  - { name: operations/debs/pkg-php/php-ast,  test: 
['debian-glue-non-voting'] }
+  - name: operations/debs/pkg-php/php-ast
+test:
+  - debian-glue
+gate-and-submit:
+  - debian-glue
   - { name: operations/debs/pkg-php/php-defaults, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-redis,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus,   test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eb4f0ac4b8ddc4dbac03ffac4da6460e51a2e6e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...php-ast[master]: Rebuild for stretch-wikimedia

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404284 )

Change subject: Rebuild for stretch-wikimedia
..

Rebuild for stretch-wikimedia

Bug: T174338
Change-Id: Id46223555f00d5b6a8eda0181a523fc9f2806e94
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pkg-php/php-ast 
refs/changes/84/404284/1

diff --git a/debian/changelog b/debian/changelog
index c03a42a..4c0b5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-ast (0.1.5-1.1~bpo9+1) stretch-wikimedia; urgency=medium
+
+  * Rebuild for stretch-wikimedia
+
+ -- Antoine Musso   Mon, 15 Jan 2018 13:15:31 +0100
+
 php-ast (0.1.5-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id46223555f00d5b6a8eda0181a523fc9f2806e94
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pkg-php/php-ast
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...php-ast[master]: Fix FTBS when installing docs

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404283 )

Change subject: Fix FTBS when installing docs
..

Fix FTBS when installing docs

cp: cannot stat 'README.md': No such file or directory
dh_installdocs: cp --reflink=auto -a README.md
debian/php-ast/usr/share/doc/php-ast returned exit code 1
/usr/share/dh-php/pkg-pecl.mk:45: recipe for target 'binary' failed

760f04d65 imported upstream version 0.1.5 which moves the files to a
subdirectory:

  README.md => ast-0.1.5/README.md

The .docs file had not been updated to reflect that.

Change-Id: If2eea854c79abae2e86a141584d424a586f4d72b
---
M debian/changelog
M debian/php-ast.docs
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pkg-php/php-ast 
refs/changes/83/404283/1

diff --git a/debian/changelog b/debian/changelog
index 63f519f..c03a42a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php-ast (0.1.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix path to README.md which broke dh_installdocs
+
+ -- Antoine Musso   Mon, 15 Jan 2018 13:11:50 +0100
+
 php-ast (0.1.5-1) unstable; urgency=medium
 
   * Change debian/watch to PECL
diff --git a/debian/php-ast.docs b/debian/php-ast.docs
index b43bf86..349fa20 100644
--- a/debian/php-ast.docs
+++ b/debian/php-ast.docs
@@ -1 +1 @@
-README.md
+ast-0.1.5/README.md

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2eea854c79abae2e86a141584d424a586f4d72b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pkg-php/php-ast
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: debian-glue for operations/debs/pkg-php/php-ast

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404280 )

Change subject: debian-glue for operations/debs/pkg-php/php-ast
..

debian-glue for operations/debs/pkg-php/php-ast

Bug: T174338
Change-Id: I350f22cdfe18e50554a047def26e7b4f239fd68b
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/80/404280/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fa9707b..1ec7929 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2275,6 +2275,7 @@
   - { name: operations/debs/phantomjs,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/php-mailparse,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php,  test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/pkg-php/php-ast,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-defaults, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-redis,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus,   test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I350f22cdfe18e50554a047def26e7b4f239fd68b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: Merge tag '2.5.1' into debian/jessie-wikimedia

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404263 )

Change subject: Merge tag '2.5.1' into debian/jessie-wikimedia
..

Merge tag '2.5.1' into debian/jessie-wikimedia

Tag 2.5.1

Bug: T158243
Change-Id: I03b36968e8b6657e1e64c89f65d0519873da9749
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/63/404263/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03b36968e8b6657e1e64c89f65d0519873da9749
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[patch-queue/debian/jessie-wikimedia]: Fix change number extraction on new enough Gerrit master

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404260 )

Change subject: Fix change number extraction on new enough Gerrit master
..


Fix change number extraction on new enough Gerrit master

Apparently, there's been a change in recent upstream Gerrit which
changed the JSON serialization of change numbers in the output of
`gerrit stream-events`. Previously, the change number was being
transmitted as a string. That has changed and now it's being sent as a
number. That results in a failure later on:

 2017-02-14 15:35:55,294 ERROR zuul.IndependentPipelineManager: Exception while 
launching job XXX for change :
  Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/zuul/scheduler.py", line 1520, in 
_launchJobs
  dependent_items)
File "/usr/lib/python2.7/site-packages/zuul/launcher/gearman.py", line 318, 
in launch
  destination_path = os.path.join(item.change.getBasePath(),
File "/usr/lib/python2.7/site-packages/zuul/model.py", line 913, in 
getBasePath
  self.number[-2:], self.number, self.patchset)
  TypeError: 'int' object has no attribute '__getitem__'

I would love to have this extended this with a proper testcase. Please
feel free to push an updated version over this patchset, or just let me
know which place is the most appropriate and I can do it myself, too.

Change-Id: I68f5fa7fa4fac0b4d2eb232fe37df11e57157ecf
---
M zuul/connection/gerrit.py
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/zuul/connection/gerrit.py b/zuul/connection/gerrit.py
index 927aa11..95bf35c 100644
--- a/zuul/connection/gerrit.py
+++ b/zuul/connection/gerrit.py
@@ -65,7 +65,7 @@
 if change:
 event.project_name = change.get('project')
 event.branch = change.get('branch')
-event.change_number = change.get('number')
+event.change_number = str(change.get('number'))
 event.change_url = change.get('url')
 patchset = data.get('patchSet')
 if patchset:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68f5fa7fa4fac0b4d2eb232fe37df11e57157ecf
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: patch-queue/debian/jessie-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[patch-queue/debian/jessie-wikimedia]: Fix change number extraction on new enough Gerrit master

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404260 )

Change subject: Fix change number extraction on new enough Gerrit master
..

Fix change number extraction on new enough Gerrit master

Apparently, there's been a change in recent upstream Gerrit which
changed the JSON serialization of change numbers in the output of
`gerrit stream-events`. Previously, the change number was being
transmitted as a string. That has changed and now it's being sent as a
number. That results in a failure later on:

 2017-02-14 15:35:55,294 ERROR zuul.IndependentPipelineManager: Exception while 
launching job XXX for change :
  Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/zuul/scheduler.py", line 1520, in 
_launchJobs
  dependent_items)
File "/usr/lib/python2.7/site-packages/zuul/launcher/gearman.py", line 318, 
in launch
  destination_path = os.path.join(item.change.getBasePath(),
File "/usr/lib/python2.7/site-packages/zuul/model.py", line 913, in 
getBasePath
  self.number[-2:], self.number, self.patchset)
  TypeError: 'int' object has no attribute '__getitem__'

I would love to have this extended this with a proper testcase. Please
feel free to push an updated version over this patchset, or just let me
know which place is the most appropriate and I can do it myself, too.

Change-Id: I68f5fa7fa4fac0b4d2eb232fe37df11e57157ecf
---
M zuul/connection/gerrit.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/60/404260/1

diff --git a/zuul/connection/gerrit.py b/zuul/connection/gerrit.py
index 927aa11..95bf35c 100644
--- a/zuul/connection/gerrit.py
+++ b/zuul/connection/gerrit.py
@@ -65,7 +65,7 @@
 if change:
 event.project_name = change.get('project')
 event.branch = change.get('branch')
-event.change_number = change.get('number')
+event.change_number = str(change.get('number'))
 event.change_url = change.get('url')
 patchset = data.get('patchSet')
 if patchset:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68f5fa7fa4fac0b4d2eb232fe37df11e57157ecf
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: patch-queue/debian/jessie-wikimedia
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Fix npm-browser-test docker tag

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404051 )

Change subject: Fix npm-browser-test docker tag
..

Fix npm-browser-test docker tag

The Docker tag should not have a `v` prefix. I did the mistake in
54d0313 :(

Bug: T177276
Bug: T184810
Change-Id: I22f1b39ce6a588c37e4402872d31541e2232e39e
---
M jjb/job-templates.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/51/404051/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index af58338..d125f11 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -229,7 +229,7 @@
 - job-template:
 !!merge : *job_npm-node-6-docker
 name: '{name}-npm-browser-node-6-docker'
-docker_image_var: 
'docker-registry.wikimedia.org/releng/npm-browser-test:v0.1.0'
+docker_image_var: 
'docker-registry.wikimedia.org/releng/npm-browser-test:0.1.0'
 # Reinject Zuul parameters since JJB strip for some reason
 triggers:
  - zuul

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22f1b39ce6a588c37e4402872d31541e2232e39e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/jenkins[master]: Revert "Add a note about mw debug file name"

[Hashar (Code Review)]

Hello Paladox, jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/404047

to review the following change.


Change subject: Revert "Add a note about mw debug file name"
..

Revert "Add a note about mw debug file name"

Sometime I am writing misleading comments :D

This reverts commit 9e5d751d5b19b60a6981593fce7a3f20a1120ef3.

Change-Id: I4b3df68efe8326b0ba259269229c96d873556e70
---
M mediawiki/conf.d/00_dev_settings.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/47/404047/1

diff --git a/mediawiki/conf.d/00_dev_settings.php 
b/mediawiki/conf.d/00_dev_settings.php
index 8a8b59c..edb2883 100644
--- a/mediawiki/conf.d/00_dev_settings.php
+++ b/mediawiki/conf.d/00_dev_settings.php
@@ -32,7 +32,6 @@
 $wgDebugRawPage = true; // bug 47960
 
 // Debugging: Logging
-// Files must follow the pattern mw-*.log we then assert they are empty
 if ( $wgCommandLineMode ) {
$wgDebugLogFile = "$wmgMwLogDir/mw-debug-cli.log";
 } else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b3df68efe8326b0ba259269229c96d873556e70
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate mediawiki-phan to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403925 )

Change subject: Migrate mediawiki-phan to docker-pkg
..

Migrate mediawiki-phan to docker-pkg

Bug: T177276
Change-Id: I6eb8382e2b85e189ebdabdcbe66db26f78045163
---
R dockerfiles/mediawiki-phan/Dockerfile.template
M dockerfiles/mediawiki-phan/README.md
A dockerfiles/mediawiki-phan/changelog
A dockerfiles/mediawiki-phan/control
M dockerfiles/mediawiki-phan/run.sh
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
7 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/25/403925/1

diff --git a/dockerfiles/mediawiki-phan/Dockerfile 
b/dockerfiles/mediawiki-phan/Dockerfile.template
similarity index 74%
rename from dockerfiles/mediawiki-phan/Dockerfile
rename to dockerfiles/mediawiki-phan/Dockerfile.template
index f4c8c8d..013d50f 100644
--- a/dockerfiles/mediawiki-phan/Dockerfile
+++ b/dockerfiles/mediawiki-phan/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest
+FROM {{ "composer" | image_tag }}
 
 USER root
 
@@ -13,4 +13,4 @@
  rm -rf /cache/*
 
 COPY run.sh /run.sh
-ENTRYPOINT ["/bin/bash", "/run.sh"]
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/mediawiki-phan/README.md 
b/dockerfiles/mediawiki-phan/README.md
index 66c0588..b2a5430 100644
--- a/dockerfiles/mediawiki-phan/README.md
+++ b/dockerfiles/mediawiki-phan/README.md
@@ -11,7 +11,7 @@
 
 ```
 docker run --rm \
--v /dev/git/gerrit/mediawiki:/mediawiki \
-wmfreleng/mediawiki-phan:latest \
-/mediawiki/extensions/ElectronPdfService -m checkstyle
-```
\ No newline at end of file
+-v /dev/git/gerrit/mediawiki:/mediawiki \
+docker-registry.wikimedia.org/releng/mediawiki-phan:latest \
+/mediawiki/extensions/ElectronPdfService -m checkstyle
+```
diff --git a/dockerfiles/mediawiki-phan/changelog 
b/dockerfiles/mediawiki-phan/changelog
new file mode 100644
index 000..36f2904
--- /dev/null
+++ b/dockerfiles/mediawiki-phan/changelog
@@ -0,0 +1,5 @@
+mediawiki-phan (0.1.0) wikimedia; urgency=medium
+
+  * Initial port to docker-pkg.
+
+ -- Antoine Musso   Fri, 12 Jan 2018 15:33:29 +0100
diff --git a/dockerfiles/mediawiki-phan/control 
b/dockerfiles/mediawiki-phan/control
new file mode 100644
index 000..c626649
--- /dev/null
+++ b/dockerfiles/mediawiki-phan/control
@@ -0,0 +1 @@
+Depends: composer
diff --git a/dockerfiles/mediawiki-phan/run.sh 
b/dockerfiles/mediawiki-phan/run.sh
old mode 100644
new mode 100755
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 7f8e025..eb21d51 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -370,7 +370,7 @@
 exec docker run \
 --rm \
 --volume "$(pwd)"/src:/mediawiki \
-wmfreleng/mediawiki-phan:v2017.10.16.20.38 \
+docker-registry.wikimedia.org/releng/mediawiki-phan:0.1.0 \
 /$ZUUL_PROJECT -m checkstyle
 # nothing else can be executed due to exec
 
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 841513b..b3ce739 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -443,7 +443,7 @@
 exec docker run \
 --rm \
 --volume "$(pwd)"/src:/mediawiki \
-wmfreleng/mediawiki-phan:v2017.10.16.20.38 \
+docker-registry.wikimedia.org/releng/mediawiki-phan:0.1.0 \
 -m checkstyle
 # nothing else can be executed due to exec
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6eb8382e2b85e189ebdabdcbe66db26f78045163
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Update ci-src-setup-simple example

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403924 )

Change subject: Update ci-src-setup-simple example
..


Update ci-src-setup-simple example

Change-Id: I52f852cecfb2197c05522dca7b5f4cf8e112a8d8
---
M dockerfiles/ci-src-setup-simple/example-run.sh
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified



diff --git a/dockerfiles/ci-src-setup-simple/example-run.sh 
b/dockerfiles/ci-src-setup-simple/example-run.sh
index 14aae7f..a657b9c 100644
--- a/dockerfiles/ci-src-setup-simple/example-run.sh
+++ b/dockerfiles/ci-src-setup-simple/example-run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 install --mode 777 --directory log
 docker run \
 --rm --tty \
@@ -7,5 +9,5 @@
 --env ZUUL_PROJECT=integration/jenkins \
 --env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \
 --env ZUUL_REF=refs/changes/31/316231/4 \
---volume /$(pwd)/log://var/lib/jenkins/log \
- wmfreleng/ci-src-setup-simple:latest
+--volume "/$(pwd)/log"://var/lib/jenkins/log \
+docker-registry.wikimedia.org/releng/ci-src-setup-simple:latest

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52f852cecfb2197c05522dca7b5f4cf8e112a8d8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Update ci-src-setup-simple example

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403924 )

Change subject: Update ci-src-setup-simple example
..

Update ci-src-setup-simple example

Change-Id: I52f852cecfb2197c05522dca7b5f4cf8e112a8d8
---
M dockerfiles/ci-src-setup-simple/example-run.sh
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/24/403924/1

diff --git a/dockerfiles/ci-src-setup-simple/example-run.sh 
b/dockerfiles/ci-src-setup-simple/example-run.sh
index 14aae7f..a657b9c 100644
--- a/dockerfiles/ci-src-setup-simple/example-run.sh
+++ b/dockerfiles/ci-src-setup-simple/example-run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 install --mode 777 --directory log
 docker run \
 --rm --tty \
@@ -7,5 +9,5 @@
 --env ZUUL_PROJECT=integration/jenkins \
 --env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \
 --env ZUUL_REF=refs/changes/31/316231/4 \
---volume /$(pwd)/log://var/lib/jenkins/log \
- wmfreleng/ci-src-setup-simple:latest
+--volume "/$(pwd)/log"://var/lib/jenkins/log \
+docker-registry.wikimedia.org/releng/ci-src-setup-simple:latest

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f852cecfb2197c05522dca7b5f4cf8e112a8d8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate mediawiki-phpcs to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403923 )

Change subject: Migrate mediawiki-phpcs to docker-pkg
..

Migrate mediawiki-phpcs to docker-pkg

Bug: T177276
Change-Id: I3dbfabe51fc7eb620e30b288dd90957e5dd4bf4f
---
D dockerfiles/mediawiki-phpcs/Dockerfile
A dockerfiles/mediawiki-phpcs/Dockerfile.template
A dockerfiles/mediawiki-phpcs/changelog
A dockerfiles/mediawiki-phpcs/control
M dockerfiles/mediawiki-phpcs/example-run.sh
M dockerfiles/mediawiki-phpcs/run.sh
M jjb/mediawiki.yaml
7 files changed, 28 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/403923/1

diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile 
b/dockerfiles/mediawiki-phpcs/Dockerfile
deleted file mode 100644
index 1af5c3e..000
--- a/dockerfiles/mediawiki-phpcs/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM wmfreleng/composer:latest
-
-USER nobody
-COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile.template 
b/dockerfiles/mediawiki-phpcs/Dockerfile.template
new file mode 100644
index 000..212e21d
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/Dockerfile.template
@@ -0,0 +1,5 @@
+FROM {{ "composer" | image_tag }}
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/mediawiki-phpcs/changelog 
b/dockerfiles/mediawiki-phpcs/changelog
new file mode 100644
index 000..3b2f9a5
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/changelog
@@ -0,0 +1,7 @@
+mediawiki-phpcs (0.1.0) wikimedia; urgency=medium
+
+  * Initial port to docker-pkg
+  * Change ENTRYPOINT to exec form
+  * fix example-run.sh which was no more fetching sources
+
+ -- Antoine Musso   Fri, 12 Jan 2018 14:46:19 +0100
diff --git a/dockerfiles/mediawiki-phpcs/control 
b/dockerfiles/mediawiki-phpcs/control
new file mode 100644
index 000..c626649
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/control
@@ -0,0 +1 @@
+Depends: composer
diff --git a/dockerfiles/mediawiki-phpcs/example-run.sh 
b/dockerfiles/mediawiki-phpcs/example-run.sh
index 124cccd..f11e4f8 100644
--- a/dockerfiles/mediawiki-phpcs/example-run.sh
+++ b/dockerfiles/mediawiki-phpcs/example-run.sh
@@ -1,11 +1,22 @@
 #!/bin/bash
 
-install --mode 777 --directory log
+set -euo pipefail
+
+install --mode 777 --directory cache log src
+
 docker run \
 --rm --tty \
 --env ZUUL_URL=https://gerrit.wikimedia.org/r \
 --env ZUUL_PROJECT=mediawiki/core \
 --env ZUUL_COMMIT=e447a97de58e9e2b4dd6a6e31a91edc68dde1217 \
 --env ZUUL_REF=refs/changes/52/378752/2 \
---volume /$(pwd)/log://var/lib/jenkins/log \
- wmfreleng/mediawiki-phpcs:latest
+--volume "/$(pwd)/cache://cache" \
+--volume "/$(pwd)/src://src" \
+docker-registry.wikimedia.org/releng/ci-src-setup-simple:latest
+
+docker run \
+--rm --tty \
+--volume "/$(pwd)/cache:/cache" \
+--volume "/$(pwd)/log://var/lib/jenkins/log" \
+--volume "/$(pwd)/src://src" \
+docker-registry.wikimedia.org/releng/mediawiki-phpcs:latest
diff --git a/dockerfiles/mediawiki-phpcs/run.sh 
b/dockerfiles/mediawiki-phpcs/run.sh
old mode 100644
new mode 100755
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 3141446..841513b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -402,7 +402,7 @@
  - docker-cache-dir
  - docker-ci-src-setup-simple
  - docker-run-with-log-cache-src:
-image: 'wmfreleng/mediawiki-phpcs:v2017.10.28.06.43'
+image: 'docker-registry.wikimedia.org/releng/mediawiki-phpcs:0.1.0'
 logdir: '/log'
 publishers:
  - checkstyle:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dbfabe51fc7eb620e30b288dd90957e5dd4bf4f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate npm stretch containers to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403921 )

Change subject: Migrate npm stretch containers to docker-pkg
..

Migrate npm stretch containers to docker-pkg

Update npm-browser-test

Update:
analytics-wikistats2-npm-browser-node-6-docker
chromium-render-npm-browser-node-6-docker
mwgate-npm-browser-node-6-docker
oojs-core-npm-browser-node-6-docker
unicodejs-npm-browser-node-6-docker
visualeditor-npm-browser-node-6-docker
wikibase-data-values-value-view-npm-browser-node-6-docker
wikibase-javascript-api-npm-browser-node-6-docker
wikidata-query-gui-npm-browser-node-6-docker
wikimedia-portals-deploy-npm-browser-node-6-docker
wikimedia-portals-npm-browser-node-6-docker

Bug: T177276
Change-Id: Idf1fd6fe37bbe6c4a9e2e4fafe141626ba1ad30c
---
A dockerfiles/npm-browser-test/.gitignore
R dockerfiles/npm-browser-test/Dockerfile.template
A dockerfiles/npm-browser-test/changelog
A dockerfiles/npm-browser-test/control
M dockerfiles/npm-browser-test/example-run.sh
R dockerfiles/npm-stretch/Dockerfile.template
A dockerfiles/npm-stretch/changelog
A dockerfiles/npm-stretch/control
A dockerfiles/npm-test-stretch/.gitignore
R dockerfiles/npm-test-stretch/Dockerfile.template
A dockerfiles/npm-test-stretch/changelog
A dockerfiles/npm-test-stretch/control
M dockerfiles/npm-test-stretch/example-run.sh
M jjb/job-templates.yaml
14 files changed, 44 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/21/403921/1

diff --git a/dockerfiles/npm-browser-test/.gitignore 
b/dockerfiles/npm-browser-test/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-browser-test/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-browser-test/Dockerfile 
b/dockerfiles/npm-browser-test/Dockerfile.template
similarity index 68%
rename from dockerfiles/npm-browser-test/Dockerfile
rename to dockerfiles/npm-browser-test/Dockerfile.template
index f89be23..7fce0a2 100644
--- a/dockerfiles/npm-browser-test/Dockerfile
+++ b/dockerfiles/npm-browser-test/Dockerfile.template
@@ -1,15 +1,7 @@
-FROM wmfreleng/npm-test-stretch:latest
+FROM {{ "npm-test-stretch" | image_tag }}
 
 USER root
-RUN apt-get update && \
-apt-get install --yes \
-chromium \
-chromium-driver \
-firefox-esr \
-phantomjs \
-xvfb \
-&& \
-apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN {{ "chromium chromium-driver firefox-esr phantomjs xvfb" | apt_install }}
 
 COPY firefox /usr/local/bin/firefox
 
diff --git a/dockerfiles/npm-browser-test/changelog 
b/dockerfiles/npm-browser-test/changelog
new file mode 100644
index 000..2d458fb
--- /dev/null
+++ b/dockerfiles/npm-browser-test/changelog
@@ -0,0 +1,5 @@
+npm-browser-test (0.1.0) wikimedia; urgency=medium
+
+  * Initial port to docker-pkg.
+
+ -- Antoine Musso   Fri, 12 Jan 2018 14:06:40 +0100
diff --git a/dockerfiles/npm-browser-test/control 
b/dockerfiles/npm-browser-test/control
new file mode 100644
index 000..3118ffa
--- /dev/null
+++ b/dockerfiles/npm-browser-test/control
@@ -0,0 +1 @@
+Depends: npm-test-stretch
diff --git a/dockerfiles/npm-browser-test/example-run.sh 
b/dockerfiles/npm-browser-test/example-run.sh
index 756863e..eb8c0eb 100644
--- a/dockerfiles/npm-browser-test/example-run.sh
+++ b/dockerfiles/npm-browser-test/example-run.sh
@@ -2,14 +2,13 @@
 
 set -euo pipefail
 
-mkdir -m 777 -p log
-mkdir -m 777 -p src
-mkdir -m 777 -p cache
+mkdir -m 777 -p cache log src
+(
 cd src
 git init
 git fetch --quiet --depth 1 
https://gerrit.wikimedia.org/r/data-values/value-view
 git checkout FETCH_HEAD
-cd ..
+)
 
 docker run \
 --rm --tty \
@@ -17,5 +16,4 @@
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/log://log \
 --volume /"$(pwd)"/src://src \
- wmfreleng/npm-browser-test:latest
-rm -rf log
+docker-registry.wikimedia.org/releng/npm-browser-test:latest
diff --git a/dockerfiles/npm-stretch/Dockerfile 
b/dockerfiles/npm-stretch/Dockerfile.template
similarity index 67%
rename from dockerfiles/npm-stretch/Dockerfile
rename to dockerfiles/npm-stretch/Dockerfile.template
index 755227f..d1d9d83 100644
--- a/dockerfiles/npm-stretch/Dockerfile
+++ b/dockerfiles/npm-stretch/Dockerfile.template
@@ -1,7 +1,7 @@
 # Debian stretch lacks npm, so we get our npm@3.8.3 from our Jessie based image
-FROM wmfreleng/npm:latest as npm-jessie
+FROM {{ "npm" | image_tag }} as npm-jessie
 
-FROM wmfreleng/ci-stretch:latest
+FROM {{ "ci-stretch" | image_tag }}
 COPY --from=npm-jessie /usr/local/lib/node_modules/npm/ 
/usr/local/lib/node_modules/npm/
 # Manually link since COPY copies symlink destination instead of the actual 
symlink
 RUN ln -s ../lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
@@ -11,13 +11,9 @@
 # build-essential for compilation
 # python-minimal for 

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate npm-test images to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403907 )

Change subject: Migrate npm-test images to docker-pkg
..

Migrate npm-test images to docker-pkg

The npm-test stretch ones will be done as part of another change.

Update:
change-propagation-npm-node-6-docker
graphoid-npm-node-6-docker
kartotherian-npm-node-6-docker
mathoid-npm-node-6-docker
tilerator-npm-node-6-docker
trending-edits-npm-node-6-docker

Bug: T177276
Change-Id: I14fef7af7e9ea364ec3fac4a197c9c6669a5f5df
---
A dockerfiles/npm-test-graphoid/.gitignore
D dockerfiles/npm-test-graphoid/Dockerfile
A dockerfiles/npm-test-graphoid/Dockerfile.template
A dockerfiles/npm-test-graphoid/changelog
A dockerfiles/npm-test-graphoid/control
M dockerfiles/npm-test-graphoid/example-run.sh
A dockerfiles/npm-test-librdkafka/.gitignore
D dockerfiles/npm-test-librdkafka/Dockerfile
A dockerfiles/npm-test-librdkafka/Dockerfile.template
A dockerfiles/npm-test-librdkafka/changelog
M dockerfiles/npm-test-librdkafka/example-run.sh
M dockerfiles/npm-test-maps-service/.dockerignore
A dockerfiles/npm-test-maps-service/.gitignore
D dockerfiles/npm-test-maps-service/Dockerfile
A dockerfiles/npm-test-maps-service/Dockerfile.template
A dockerfiles/npm-test-maps-service/changelog
M dockerfiles/npm-test-maps-service/example-run.sh
A dockerfiles/npm-test-mathoid/.gitignore
D dockerfiles/npm-test-mathoid/Dockerfile
A dockerfiles/npm-test-mathoid/Dockerfile.template
A dockerfiles/npm-test-mathoid/changelog
M dockerfiles/npm-test-mathoid/example-run.sh
M jjb/mediawiki-services.yaml
23 files changed, 102 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/07/403907/1

diff --git a/dockerfiles/npm-test-graphoid/.gitignore 
b/dockerfiles/npm-test-graphoid/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-graphoid/Dockerfile 
b/dockerfiles/npm-test-graphoid/Dockerfile
deleted file mode 100644
index c9aa1f2..000
--- a/dockerfiles/npm-test-graphoid/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM wmfreleng/npm-test
-
-USER root
-RUN apt-get update \
-&& apt-get install --yes \
-libcairo2-dev \
-libgif-dev \
-libpango1.0-dev \
-libjpeg62-turbo-dev \
-&& apt-get clean && rm -rf /var/lib/apt/lists/*
-USER nobody
diff --git a/dockerfiles/npm-test-graphoid/Dockerfile.template 
b/dockerfiles/npm-test-graphoid/Dockerfile.template
new file mode 100644
index 000..4a1fe07
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "npm-test" | image_tag }}
+
+USER root
+
+RUN {{ "libcairo2-dev libgif-dev libpango1.0-dev libjpeg62-turbo-dev" | 
apt_install }}
+
+USER nobody
diff --git a/dockerfiles/npm-test-graphoid/changelog 
b/dockerfiles/npm-test-graphoid/changelog
new file mode 100644
index 000..b299bda
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/changelog
@@ -0,0 +1,5 @@
+npm-test-graphoid (0.1.0) wikimedia; urgency=medium
+
+  * Initial port to docker-pkg.
+
+ -- Antoine Musso   Fri, 12 Jan 2018 11:45:52 +0100
diff --git a/dockerfiles/npm-test-graphoid/control 
b/dockerfiles/npm-test-graphoid/control
new file mode 100644
index 000..ae1d238
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/control
@@ -0,0 +1 @@
+Depends: npm-test
diff --git a/dockerfiles/npm-test-graphoid/example-run.sh 
b/dockerfiles/npm-test-graphoid/example-run.sh
index 8a9b640..de2788d 100644
--- a/dockerfiles/npm-test-graphoid/example-run.sh
+++ b/dockerfiles/npm-test-graphoid/example-run.sh
@@ -2,12 +2,13 @@
 
 set -eux -o pipefail
 
-install --mode 777 --directory log cache src
+install --mode 2777 --directory cache log src
+(
 cd src
 git init
 git fetch --quiet --depth 1 
"https://gerrit.wikimedia.org/r/mediawiki/services/graphoid; "master"
 git checkout FETCH_HEAD
-cd ..
+)
 
 docker run \
 --rm --tty \
@@ -15,4 +16,4 @@
 --volume /"$(pwd)"/log://var/lib/jenkins/log \
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
- wmfreleng/npm-test-graphoid:latest
+docker-registry.wikimedia.org/releng/npm-test-graphoid:latest
diff --git a/dockerfiles/npm-test-librdkafka/.gitignore 
b/dockerfiles/npm-test-librdkafka/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-librdkafka/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-librdkafka/Dockerfile 
b/dockerfiles/npm-test-librdkafka/Dockerfile
deleted file mode 100644
index 6e273e4..000
--- a/dockerfiles/npm-test-librdkafka/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM wmfreleng/npm-test
-
-USER root
-RUN apt-get update \
-&& apt-get install --yes \
-libsasl2-dev \
-&& apt-get install --yes -t jessie-wikimedia \
-

[MediaWiki-commits] [Gerrit] integration/config[master]: Convert npm, npm-test to docker-pkg (2)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403896 )

Change subject: Convert npm, npm-test to docker-pkg (2)
..

Convert npm, npm-test to docker-pkg (2)

Redoing the change this time with node-tunnel-agent 0.4.3. That fix npm
1.4.21 no being able to communicate with a http proxy under NodeJs 4.

Update jobs:
apps-android-wikipedia-npm-node-6-docker
fundraising-dash-npm-node-6-docker
mapdata-npm-node-6-docker
marvin-npm-node-6-docker
mediawiki-core-npm-node-6-docker
mediawiki-core-php70-phan-docker
mwgate-npm-node-6-docker
npm-node-6-docker
pywikibot-i18n-npm-node-6-docker
visualeditor-npm-run-doc-node-6-docker

Bug: T177276
Change-Id: I639c9dc317e66659c3a599ff6e414b71b58e7e87
---
R dockerfiles/npm-test/Dockerfile.template
A dockerfiles/npm-test/changelog
A dockerfiles/npm-test/control
M dockerfiles/npm-test/example-run.sh
D dockerfiles/npm/Dockerfile
A dockerfiles/npm/Dockerfile.template
A dockerfiles/npm/changelog
A dockerfiles/npm/control
M jjb/job-templates.yaml
9 files changed, 59 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/96/403896/1

diff --git a/dockerfiles/npm-test/Dockerfile 
b/dockerfiles/npm-test/Dockerfile.template
similarity index 65%
rename from dockerfiles/npm-test/Dockerfile
rename to dockerfiles/npm-test/Dockerfile.template
index 13b815d..bfb7745 100644
--- a/dockerfiles/npm-test/Dockerfile
+++ b/dockerfiles/npm-test/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/npm:latest
+FROM {{ 'npm' | image_tag }}
 
 USER nobody
 COPY run.sh /run.sh
diff --git a/dockerfiles/npm-test/changelog b/dockerfiles/npm-test/changelog
new file mode 100644
index 000..d5ebc3e
--- /dev/null
+++ b/dockerfiles/npm-test/changelog
@@ -0,0 +1,11 @@
+npm-test (0.2.0) wikimedia; urgency=medium
+
+  * Build with node-tunnel-agent 0.4.3 (T183569)
+
+ -- Antoine Musso   Fri, 12 Jan 2018 10:28:22 +0100
+
+npm-test (0.1.0) wikimedia; urgency=medium
+
+  * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto   Fri, 03 Nov 2017 15:22:53 
+0100
diff --git a/dockerfiles/npm-test/control b/dockerfiles/npm-test/control
new file mode 100644
index 000..2246c05
--- /dev/null
+++ b/dockerfiles/npm-test/control
@@ -0,0 +1,4 @@
+Package: npm-test
+Description: Docker image with npm for running npm tests
+Depends: npm
+Maintainer: Kunal Mehta 
diff --git a/dockerfiles/npm-test/example-run.sh 
b/dockerfiles/npm-test/example-run.sh
index 98ff073..4cee239 100644
--- a/dockerfiles/npm-test/example-run.sh
+++ b/dockerfiles/npm-test/example-run.sh
@@ -18,7 +18,7 @@
 --volume /"$(pwd)"/log://var/lib/jenkins/log \
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
- wmfreleng/npm-test:latest \
+docker-registry.wikimedia.org/releng/npm-test:latest \
 doc
 
 if grep -q JSDuck src/docs/index.html; then
@@ -33,4 +33,4 @@
 --volume /"$(pwd)"/log://var/lib/jenkins/log \
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
- wmfreleng/npm-test:latest
+docker-registry.wikimedia.org/releng/npm-test:latest
diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile
deleted file mode 100644
index 9293153..000
--- a/dockerfiles/npm/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM wmfreleng/ci-jessie:latest
-
-# Install nodejs-legacy to provide /usr/bin/node alias
-#
-# build-essential for compilation
-# python-minimal for node-gyp
-# ruby/etc for jsduck
-RUN apt-get update && \
-apt-get install --yes \
-nodejs-legacy npm \
-python-minimal \
-ruby ruby2.1 ruby2.1-dev rubygems-integration build-essential && \
-gem install --no-rdoc --no-ri jsduck && \
-apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
-RUN npm install -g npm@3.8.3
-
-# If no volume is mounted, make sure /cache exists
-RUN install --directory /cache --owner nobody
-
-USER nobody
-
-# See 
-# and 
-ENV NPM_CONFIG_CACHE=/cache
-ENV BABEL_CACHE_PATH=$XDG_CACHE_HOME/babel-cache.json
-
-ENTRYPOINT ["npm"]
-CMD ["--help"]
diff --git a/dockerfiles/npm/Dockerfile.template 
b/dockerfiles/npm/Dockerfile.template
new file mode 100644
index 000..d1052ca
--- /dev/null
+++ b/dockerfiles/npm/Dockerfile.template
@@ -0,0 +1,25 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+# DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
+ARG NPM_VERSION="3.8.3"
+
+# Install nodejs-legacy to provide /usr/bin/node alias
+#
+# build-essential for compilation
+# python-minimal for node-gyp
+# ruby/etc for jsduck
+RUN {{ "nodejs-legacy npm ruby ruby2.1 ruby2.1-dev rubygems-integration 
python-minimal build-essential" | apt_install }} \
+&& npm 

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[master]: Fix UNRELEASED in debian/changelog

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403760 )

Change subject: Fix UNRELEASED in debian/changelog
..

Fix UNRELEASED in debian/changelog

Package is build for jessie.

Change-Id: I89597070c5e8939193937f442cc469aca790c0d0
---
M debian/changelog
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/node-tunnel-agent 
refs/changes/60/403760/1

diff --git a/debian/changelog b/debian/changelog
index f4801cf..068de7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-node-tunnel-agent (0.4.3-1) UNRELEASED; urgency=medium
+node-tunnel-agent (0.4.3-1) jessie-wikimedia; urgency=medium
 
   * gbp basic configuration
   * New upstream version 0.4.3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89597070c5e8939193937f442cc469aca790c0d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump timeout for search-mjolnir-tox-docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403746 )

Change subject: Bump timeout for search-mjolnir-tox-docker
..

Bump timeout for search-mjolnir-tox-docker

https://gerrit.wikimedia.org/r/#/c/403334/ adds xgboost as a dependency
and that modules takes a while to compile. The job ends up timing out.

Raise timeout from 6 minutes to 10 minutes.

Bug: T184754
Change-Id: I9394d54a68c9a5c092a8c25fb43c19057ba23778
---
M jjb/search.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/46/403746/1

diff --git a/jjb/search.yaml b/jjb/search.yaml
index 7b75f50..37c3350 100644
--- a/jjb/search.yaml
+++ b/jjb/search.yaml
@@ -21,7 +21,7 @@
 jobs:
 - '{name}-tox-docker':
 docker_image_var: 
docker-registry.wikimedia.org/releng/tox-pyspark:0.1.0
-build_timeout: 6 # minutes
+build_timeout: 10 # minutes, xgboost takes a while to compile 
T184754
 # Sadly this does not test the python code with the jvm code, instead
 # using the last release of the jvm code, But it's a good start.
 - '{name}-maven':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9394d54a68c9a5c092a8c25fb43c19057ba23778
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Drop cache busters from composer-hhvm/composer-php55

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403676 )

Change subject: Drop cache busters from composer-hhvm/composer-php55
..


Drop cache busters from composer-hhvm/composer-php55

Change-Id: I9601784a22e85559be98dfb0eeed0d8c36b0e10e
---
M dockerfiles/composer-hhvm/Dockerfile.template
M dockerfiles/composer-php55/Dockerfile.template
2 files changed, 0 insertions(+), 2 deletions(-)



diff --git a/dockerfiles/composer-hhvm/Dockerfile.template 
b/dockerfiles/composer-hhvm/Dockerfile.template
index 2f9f2ea..a4ee66d 100644
--- a/dockerfiles/composer-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-hhvm/Dockerfile.template
@@ -3,7 +3,6 @@
 FROM {{ "hhvm" | image_tag }}
 
 COPY --from=composer /srv/composer /srv/composer
-COPY --from=composer /.cache-buster-composer /.cache-buster-composer
 # Manually link since COPY copies symlink destination instead of the actual 
symlink
 USER root
 RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
diff --git a/dockerfiles/composer-php55/Dockerfile.template 
b/dockerfiles/composer-php55/Dockerfile.template
index 5914bd5..7481843 100644
--- a/dockerfiles/composer-php55/Dockerfile.template
+++ b/dockerfiles/composer-php55/Dockerfile.template
@@ -3,7 +3,6 @@
 FROM {{ "php55" | image_tag }}
 
 COPY --from=composer /srv/composer /srv/composer
-COPY --from=composer /.cache-buster-composer /.cache-buster-composer
 # Manually link since COPY copies symlink destination instead of the actual 
symlink
 USER root
 RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9601784a22e85559be98dfb0eeed0d8c36b0e10e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Drop cache busters from composer-hhvm/composer-php55

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403676 )

Change subject: Drop cache busters from composer-hhvm/composer-php55
..

Drop cache busters from composer-hhvm/composer-php55

Change-Id: I9601784a22e85559be98dfb0eeed0d8c36b0e10e
---
M dockerfiles/composer-hhvm/Dockerfile.template
M dockerfiles/composer-php55/Dockerfile.template
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/403676/1

diff --git a/dockerfiles/composer-hhvm/Dockerfile.template 
b/dockerfiles/composer-hhvm/Dockerfile.template
index 2f9f2ea..a4ee66d 100644
--- a/dockerfiles/composer-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-hhvm/Dockerfile.template
@@ -3,7 +3,6 @@
 FROM {{ "hhvm" | image_tag }}
 
 COPY --from=composer /srv/composer /srv/composer
-COPY --from=composer /.cache-buster-composer /.cache-buster-composer
 # Manually link since COPY copies symlink destination instead of the actual 
symlink
 USER root
 RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
diff --git a/dockerfiles/composer-php55/Dockerfile.template 
b/dockerfiles/composer-php55/Dockerfile.template
index 5914bd5..7481843 100644
--- a/dockerfiles/composer-php55/Dockerfile.template
+++ b/dockerfiles/composer-php55/Dockerfile.template
@@ -3,7 +3,6 @@
 FROM {{ "php55" | image_tag }}
 
 COPY --from=composer /srv/composer /srv/composer
-COPY --from=composer /.cache-buster-composer /.cache-buster-composer
 # Manually link since COPY copies symlink destination instead of the actual 
symlink
 USER root
 RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9601784a22e85559be98dfb0eeed0d8c36b0e10e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Rebuild ci-src-setup with composer from our Docker registry

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403672 )

Change subject: Rebuild ci-src-setup with composer from our Docker registry
..

Rebuild ci-src-setup with composer from our Docker registry

Update:
mediawiki-core-php70-phan-docker
mwext-php70-phan-docker

Change-Id: I835080589fa4b66a22bf5dba7e6ba485e0b616a5
---
M dockerfiles/ci-src-setup/Dockerfile.template
M dockerfiles/ci-src-setup/changelog
M dockerfiles/ci-src-setup/control
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
5 files changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/72/403672/1

diff --git a/dockerfiles/ci-src-setup/Dockerfile.template 
b/dockerfiles/ci-src-setup/Dockerfile.template
index b1d685e..14cb92a 100644
--- a/dockerfiles/ci-src-setup/Dockerfile.template
+++ b/dockerfiles/ci-src-setup/Dockerfile.template
@@ -3,7 +3,7 @@
 RUN git clone --depth 1 
https://gerrit.wikimedia.org/r/p/integration/jenkins.git /srv/jenkins && \
 rm -rf /srv/jenkins/.git
 
-FROM wmfreleng/composer:latest as composer
+FROM {{ "composer" | image_tag }} as composer
 
 FROM {{ "ci-jessie" | image_tag }}
 
diff --git a/dockerfiles/ci-src-setup/changelog 
b/dockerfiles/ci-src-setup/changelog
index 497fa78..07fab67 100644
--- a/dockerfiles/ci-src-setup/changelog
+++ b/dockerfiles/ci-src-setup/changelog
@@ -1,3 +1,10 @@
+ci-src-setup (0.2.0) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/composer
+  * Add composer to Depends
+
+ -- Antoine Musso   Thu, 11 Jan 2018 16:03:14 +0100
+
 ci-src-setup (0.1.1) wikimedia; urgency=medium
 
   * Add php7.0-curl - T183322
diff --git a/dockerfiles/ci-src-setup/control b/dockerfiles/ci-src-setup/control
index 8c6d9e3..c5dfcf3 100644
--- a/dockerfiles/ci-src-setup/control
+++ b/dockerfiles/ci-src-setup/control
@@ -1 +1 @@
-Depends: ci-jessie
+Depends: ci-jessie, composer
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 8f12afe..0fc3768 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -109,7 +109,7 @@
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
 --entrypoint "bash" \
-docker-registry.wikimedia.org/releng/ci-src-setup:0.1.1 \
+docker-registry.wikimedia.org/releng/ci-src-setup:0.2.0 \
 /srv/setup-mwext.sh
 # nothing else can be executed due to exec
 
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 50a6ed5..3141446 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -436,7 +436,7 @@
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
 --entrypoint "bash" \
-docker-registry.wikimedia.org/releng/ci-src-setup:0.1.1 \
+docker-registry.wikimedia.org/releng/ci-src-setup:0.2.0 \
 /srv/setup-mw.sh
 # nothing else can be executed due to exec
  - shell: |

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I835080589fa4b66a22bf5dba7e6ba485e0b616a5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Rebuild using composer from docker-registry

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403666 )

Change subject: Rebuild using composer from docker-registry
..

Rebuild using composer from docker-registry

Change-Id: If49d9556d24bdacbee5eba5f091e1a94636e7d4f
---
M dockerfiles/composer-hhvm/Dockerfile.template
M dockerfiles/composer-hhvm/changelog
M dockerfiles/composer-hhvm/control
M dockerfiles/composer-php55/Dockerfile.template
M dockerfiles/composer-php55/changelog
M dockerfiles/composer-php55/control
6 files changed, 18 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/66/403666/1

diff --git a/dockerfiles/composer-hhvm/Dockerfile.template 
b/dockerfiles/composer-hhvm/Dockerfile.template
index 60c3f4e..2f9f2ea 100644
--- a/dockerfiles/composer-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-hhvm/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest as composer
+FROM {{ "composer" | image_tag }} as composer
 
 FROM {{ "hhvm" | image_tag }}
 
diff --git a/dockerfiles/composer-hhvm/changelog 
b/dockerfiles/composer-hhvm/changelog
index bdcbeb1..363a455 100644
--- a/dockerfiles/composer-hhvm/changelog
+++ b/dockerfiles/composer-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-hhvm (0.2.0) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/composer
+  * Add composer to Depends
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:53:01 +0100
+
 composer-hhvm (0.1.3) wikimedia; urgency=medium
 
   * Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-hhvm/control 
b/dockerfiles/composer-hhvm/control
index b3f7435..16d922c 100644
--- a/dockerfiles/composer-hhvm/control
+++ b/dockerfiles/composer-hhvm/control
@@ -1 +1 @@
-Depends: hhvm
+Depends: hhvm, composer
diff --git a/dockerfiles/composer-php55/Dockerfile.template 
b/dockerfiles/composer-php55/Dockerfile.template
index 8bc6496..5914bd5 100644
--- a/dockerfiles/composer-php55/Dockerfile.template
+++ b/dockerfiles/composer-php55/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest as composer
+FROM {{ "composer" | image_tag }} as composer
 
 FROM {{ "php55" | image_tag }}
 
diff --git a/dockerfiles/composer-php55/changelog 
b/dockerfiles/composer-php55/changelog
index 3dfc4bf..7079dbb 100644
--- a/dockerfiles/composer-php55/changelog
+++ b/dockerfiles/composer-php55/changelog
@@ -1,3 +1,10 @@
+composer-php55 (0.2.0) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/composer
+  * Add composer to Depends
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:53:37 +0100
+
 composer-php55 (0.1.1) wikimedia; urgency=medium
 
   * Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-php55/control 
b/dockerfiles/composer-php55/control
index 9690b0b..afe20f3 100644
--- a/dockerfiles/composer-php55/control
+++ b/dockerfiles/composer-php55/control
@@ -1 +1 @@
-Depends: php55
+Depends: php55, composer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If49d9556d24bdacbee5eba5f091e1a94636e7d4f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Rebuild using composer from docker-registry

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403667 )

Change subject:  Rebuild using composer from docker-registry
..

Rebuild using composer from docker-registry

Change-Id: I49a9cca2c6f4c53b498030cdad741cf69bd41135
---
M dockerfiles/composer-package-hhvm/changelog
M dockerfiles/composer-package-php55/changelog
M dockerfiles/composer-test-hhvm/changelog
M dockerfiles/composer-test-php55/changelog
M jjb/mediawiki.yaml
M jjb/php.yaml
6 files changed, 32 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/67/403667/1

diff --git a/dockerfiles/composer-package-hhvm/changelog 
b/dockerfiles/composer-package-hhvm/changelog
index 9884dbf..190cf58 100644
--- a/dockerfiles/composer-package-hhvm/changelog
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -1,3 +1,9 @@
+composer-package-hhvm (0.2.1) wikimedia; urgency=medium
+
+  * Use docker-registry.wikimedia.org/releng/composer
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:56:53 +0100
+
 composer-package-hhvm (0.2.0) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/composer-package
diff --git a/dockerfiles/composer-package-php55/changelog 
b/dockerfiles/composer-package-php55/changelog
index b7dc6ca..af3a819 100644
--- a/dockerfiles/composer-package-php55/changelog
+++ b/dockerfiles/composer-package-php55/changelog
@@ -1,3 +1,9 @@
+composer-package-php55 (0.2.2) wikimedia; urgency=medium
+
+  * Use docker-registry.wikimedia.org/releng/composer
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:58:23 +0100
+
 composer-package-php55 (0.2.0) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/composer-package
diff --git a/dockerfiles/composer-test-hhvm/changelog 
b/dockerfiles/composer-test-hhvm/changelog
index e5b63a8..4724eb8 100644
--- a/dockerfiles/composer-test-hhvm/changelog
+++ b/dockerfiles/composer-test-hhvm/changelog
@@ -1,3 +1,9 @@
+composer-test-hhvm (0.2.1) wikimedia; urgency=medium
+
+  * Use docker-registry.wikimedia.org/releng/composer
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:57:25 +0100
+
 composer-test-hhvm (0.2.0) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/composer-test
diff --git a/dockerfiles/composer-test-php55/changelog 
b/dockerfiles/composer-test-php55/changelog
index 6b53734..c825cc6 100644
--- a/dockerfiles/composer-test-php55/changelog
+++ b/dockerfiles/composer-test-php55/changelog
@@ -1,3 +1,9 @@
+composer-test-php55 (0.2.1) wikimedia; urgency=medium
+
+  * Use docker-registry.wikimedia.org/releng/composer
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:57:59 +0100
+
 composer-test-php55 (0.2.0) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/composer-test
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 0f7ef9a..50a6ed5 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -263,17 +263,17 @@
 - '{name}-composer-package-{phpflavor}-docker': _docker
 phpflavor:
 - hhvm:
-image: 
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.2.0
+image: 
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.2.1
 - php55:
-image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.2.0
+image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.2.1
 - php70:
 image: 
docker-registry.wikimedia.org/releng/composer-package:0.1.0
 - '{name}-composer-{phpflavor}-docker':
 phpflavor:
 - hhvm:
-image: 
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.2.0
+image: 
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.2.1
 - php55:
-image: 
docker-registry.wikimedia.org/releng/composer-test-php55:0.2.0
+image: 
docker-registry.wikimedia.org/releng/composer-test-php55:0.2.1
 - php70:
 image: 
docker-registry.wikimedia.org/releng/composer-test:0.1.0
 - '{name}-composer-validate'
diff --git a/jjb/php.yaml b/jjb/php.yaml
index cd10a72..951fbdb 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -203,16 +203,16 @@
 - 'composer-package-{phpflavor}-docker':
 phpflavor:
 - hhvm:
-image: 
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.2.0
+image: 
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.2.1
 - php55:
-image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.2.0
+image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.2.1
 

[MediaWiki-commits] [Gerrit] integration/config[master]: Use composer images from docker-registry

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403659 )

Change subject: Use composer images from docker-registry
..

Use composer images from docker-registry

Update:
composer-hhvm-docker
composer-package-hhvm-docker
composer-package-php55-docker
composer-php55-docker
mwgate-composer-hhvm-docker
mwgate-composer-package-hhvm-docker
mwgate-composer-package-php55-docker
mwgate-composer-php55-docker

Change-Id: I4e17e2a1ee358932d6aaccb209fa587254d2a6ad
---
M dockerfiles/composer-package-hhvm/Dockerfile.template
M dockerfiles/composer-package-hhvm/changelog
M dockerfiles/composer-package-hhvm/control
M dockerfiles/composer-package-php55/Dockerfile.template
M dockerfiles/composer-package-php55/changelog
M dockerfiles/composer-package-php55/control
M dockerfiles/composer-test-hhvm/Dockerfile.template
M dockerfiles/composer-test-hhvm/changelog
M dockerfiles/composer-test-hhvm/control
M dockerfiles/composer-test-php55/Dockerfile.template
M dockerfiles/composer-test-php55/changelog
M dockerfiles/composer-test-php55/control
M jjb/mediawiki.yaml
M jjb/php.yaml
14 files changed, 48 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/59/403659/1

diff --git a/dockerfiles/composer-package-hhvm/Dockerfile.template 
b/dockerfiles/composer-package-hhvm/Dockerfile.template
index 4e7bc4e..b8aba04 100644
--- a/dockerfiles/composer-package-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-package-hhvm/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-package
+FROM {{ "composer-package" | image_tag }} as composer-package
 
 FROM {{ "composer-hhvm" | image_tag }}
 
 USER nobody
-COPY --from=wmfreleng/composer-package /run.sh /run.sh
+COPY --from=composer-package /run.sh /run.sh
 ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package-hhvm/changelog 
b/dockerfiles/composer-package-hhvm/changelog
index b3a357b..9884dbf 100644
--- a/dockerfiles/composer-package-hhvm/changelog
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-package-hhvm (0.2.0) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/composer-package
+  * Add composer-package to Depends
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:28:39 +0100
+
 composer-package-hhvm (0.1.3) wikimedia; urgency=medium
 
   * Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-package-hhvm/control 
b/dockerfiles/composer-package-hhvm/control
index d675692..f2e6d4a 100644
--- a/dockerfiles/composer-package-hhvm/control
+++ b/dockerfiles/composer-package-hhvm/control
@@ -1 +1 @@
-Depends: composer-hhvm
+Depends: composer-hhvm, composer-package
diff --git a/dockerfiles/composer-package-php55/Dockerfile.template 
b/dockerfiles/composer-package-php55/Dockerfile.template
index f23c8c2..446d90f 100644
--- a/dockerfiles/composer-package-php55/Dockerfile.template
+++ b/dockerfiles/composer-package-php55/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-package
+FROM {{ "composer-package" | image_tag }} as composer-package
 
 FROM {{ "composer-php55" | image_tag }}
 
 USER nobody
-COPY --from=wmfreleng/composer-package /run.sh /run.sh
+COPY --from=composer-package /run.sh /run.sh
 ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package-php55/changelog 
b/dockerfiles/composer-package-php55/changelog
index 025bf26..b7dc6ca 100644
--- a/dockerfiles/composer-package-php55/changelog
+++ b/dockerfiles/composer-package-php55/changelog
@@ -1,3 +1,10 @@
+composer-package-php55 (0.2.0) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/composer-package
+  * Add composer-package to Depends
+
+ -- Antoine Musso   Thu, 11 Jan 2018 15:37:11 +0100
+
 composer-package-php55 (0.1.1) wikimedia; urgency=medium
 
   * Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-package-php55/control 
b/dockerfiles/composer-package-php55/control
index 03313c5..9ade185 100644
--- a/dockerfiles/composer-package-php55/control
+++ b/dockerfiles/composer-package-php55/control
@@ -1 +1 @@
-Depends: composer-php55
+Depends: composer-php55, composer-package
diff --git a/dockerfiles/composer-test-hhvm/Dockerfile.template 
b/dockerfiles/composer-test-hhvm/Dockerfile.template
index 88783a0..4d55d64 100644
--- a/dockerfiles/composer-test-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-test-hhvm/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-test
+FROM {{ "composer-test" | image_tag }} as composer-test
 
 FROM {{ "composer-hhvm" | image_tag }}
 
 USER nobody
-COPY --from=wmfreleng/composer-test /run.sh /run.sh
+COPY --from=composer-test /run.sh /run.sh
 ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test-hhvm/changelog 
b/dockerfiles/composer-test-hhvm/changelog
index 943ec87..e5b63a8 100644
--- a/dockerfiles/composer-test-hhvm/changelog
+++ 

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer-test to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403654 )

Change subject: Migrate composer-test to docker-pkg
..

Migrate composer-test to docker-pkg

Update:
composer-php70-docker
mwgate-composer-php70-docker

Bug: T177276
Change-Id: I4ad71ecaf6ff8380016e6e78a0628c7c8334385c
---
A dockerfiles/composer-test/.dockerignore
A dockerfiles/composer-test/.gitignore
D dockerfiles/composer-test/Dockerfile
A dockerfiles/composer-test/Dockerfile.template
A dockerfiles/composer-test/changelog
A dockerfiles/composer-test/control
M dockerfiles/composer-test/example-run.sh
M dockerfiles/composer-test/run.sh
M jjb/mediawiki.yaml
M jjb/php.yaml
10 files changed, 33 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/54/403654/1

diff --git a/dockerfiles/composer-test/.dockerignore 
b/dockerfiles/composer-test/.dockerignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/composer-test/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/composer-test/.gitignore 
b/dockerfiles/composer-test/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/composer-test/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/composer-test/Dockerfile 
b/dockerfiles/composer-test/Dockerfile
deleted file mode 100644
index 1af5c3e..000
--- a/dockerfiles/composer-test/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM wmfreleng/composer:latest
-
-USER nobody
-COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test/Dockerfile.template 
b/dockerfiles/composer-test/Dockerfile.template
new file mode 100644
index 000..212e21d
--- /dev/null
+++ b/dockerfiles/composer-test/Dockerfile.template
@@ -0,0 +1,5 @@
+FROM {{ "composer" | image_tag }}
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/composer-test/changelog 
b/dockerfiles/composer-test/changelog
new file mode 100644
index 000..e5e129e
--- /dev/null
+++ b/dockerfiles/composer-test/changelog
@@ -0,0 +1,7 @@
+composer-test (0.1.0) wikimedia; urgency=medium
+
+  * Initial conversion to docker-pkg
+  * change ENTRYPOINT to exec form
+  * cleanup example-run.sh
+
+ -- Antoine Musso   Thu, 11 Jan 2018 14:49:14 +0100
diff --git a/dockerfiles/composer-test/control 
b/dockerfiles/composer-test/control
new file mode 100644
index 000..c626649
--- /dev/null
+++ b/dockerfiles/composer-test/control
@@ -0,0 +1 @@
+Depends: composer
diff --git a/dockerfiles/composer-test/example-run.sh 
b/dockerfiles/composer-test/example-run.sh
old mode 100644
new mode 100755
index 29c2b67..8e692f4
--- a/dockerfiles/composer-test/example-run.sh
+++ b/dockerfiles/composer-test/example-run.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
-mkdir -m 2777 -p log src cache
+set -eux -o pipefail
 
-git init src
-git -C src fetch --quiet --depth 1 \
-"https://gerrit.wikimedia.org/r/integration/jenkins; \
-"refs/changes/31/316231/4"
-git -C src checkout FETCH_HEAD
+mkdir -m 2777 -p log src cache
+(
+cd src
+git init
+git fetch --quiet --depth 1 
"https://gerrit.wikimedia.org/r/integration/jenkins; "master"
+git checkout FETCH_HEAD
+)
 
 docker run \
 --rm --tty \
---volume /$(pwd)/log:/log \
---volume /$(pwd)/cache:/cache \
---volume /$(pwd)/src:/src \
-wmfreleng/composer-test:latest
-
-rm -rf src log cache
+--volume "/$(pwd)/cache:/cache" \
+--volume "/$(pwd)/log:/log" \
+--volume "/$(pwd)/src:/src" \
+docker-registry.wikimedia.org/releng/composer-test:latest
diff --git a/dockerfiles/composer-test/run.sh b/dockerfiles/composer-test/run.sh
old mode 100644
new mode 100755
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 9c5c2e2..1388424 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -275,7 +275,7 @@
 - php55:
 image: 
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
 - php70:
-image: wmfreleng/composer-test:v2017.10.28.06.23
+image: 
docker-registry.wikimedia.org/releng/composer-test:0.1.0
 - '{name}-composer-validate'
 - '{name}-jsduck'
 - '{name}-{phpflavor}lint':
diff --git a/jjb/php.yaml b/jjb/php.yaml
index b83d120..d978d6f 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -215,4 +215,4 @@
 - php55:
 image: 
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
 - php70:
-image: wmfreleng/composer-test:v2017.10.28.06.23
+image: 
docker-registry.wikimedia.org/releng/composer-test:0.1.0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ad71ecaf6ff8380016e6e78a0628c7c8334385c

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer-package to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403647 )

Change subject: Migrate composer-package to docker-pkg
..

Migrate composer-package to docker-pkg

Update:
 composer-package-php70-docker
 mwgate-composer-package-php70-docker

Bug: T177276
Change-Id: I5365eff94ab411c4cce30fab991d4a695772c58c
---
A dockerfiles/composer-package/.dockerignore
A dockerfiles/composer-package/.gitignore
R dockerfiles/composer-package/Dockerfile.template
A dockerfiles/composer-package/changelog
A dockerfiles/composer-package/control
M dockerfiles/composer-package/example-run.sh
M dockerfiles/composer-package/run.sh
M jjb/mediawiki.yaml
M jjb/php.yaml
9 files changed, 29 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/47/403647/1

diff --git a/dockerfiles/composer-package/.dockerignore 
b/dockerfiles/composer-package/.dockerignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/composer-package/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/composer-package/.gitignore 
b/dockerfiles/composer-package/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/composer-package/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/composer-package/Dockerfile 
b/dockerfiles/composer-package/Dockerfile.template
similarity index 64%
rename from dockerfiles/composer-package/Dockerfile
rename to dockerfiles/composer-package/Dockerfile.template
index a72a545..d1eb29b 100644
--- a/dockerfiles/composer-package/Dockerfile
+++ b/dockerfiles/composer-package/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest
+FROM {{ "composer" | image_tag }}
 
 USER root
 # Enable xdebug for PHPUnit coverage reports
@@ -6,4 +6,4 @@
 
 USER nobody
 COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/composer-package/changelog 
b/dockerfiles/composer-package/changelog
new file mode 100644
index 000..fe85dfc
--- /dev/null
+++ b/dockerfiles/composer-package/changelog
@@ -0,0 +1,7 @@
+composer-package (0.1.0) wikimedia; urgency=medium
+
+  * Initial conversion to docker-pkg
+  * change ENTRYPOINT to exec form
+  * cleanup example-run.sh
+
+ -- Antoine Musso   Thu, 11 Jan 2018 14:22:11 +0100
diff --git a/dockerfiles/composer-package/control 
b/dockerfiles/composer-package/control
new file mode 100644
index 000..c626649
--- /dev/null
+++ b/dockerfiles/composer-package/control
@@ -0,0 +1 @@
+Depends: composer
diff --git a/dockerfiles/composer-package/example-run.sh 
b/dockerfiles/composer-package/example-run.sh
old mode 100644
new mode 100755
index 50b2ebf..0ee2aea
--- a/dockerfiles/composer-package/example-run.sh
+++ b/dockerfiles/composer-package/example-run.sh
@@ -1,18 +1,21 @@
 #!/bin/bash
 
+set -eux -o pipefail
+
+mkdir -m 777 -p cache
 mkdir -m 777 -p log
 mkdir -m 777 -p src
+(
 cd src
 git init
-git fetch --quiet --depth 1 "https://gerrit.wikimedia.org/r/utfnormal; 
"refs/changes/57/375857/1"
+git fetch --quiet --depth 1 "https://gerrit.wikimedia.org/r/utfnormal; "master"
 git checkout FETCH_HEAD
-cd ..
+)
 
 mkdir -p log
 docker run \
 --rm --tty \
---volume /$(pwd)/log://var/lib/jenkins/log \
---volume /$(pwd)/src://src \
- wmfreleng/composer-package:latest
-rm -rf src
-rm -rf log
+--volume "/$(pwd)/cache://cache" \
+--volume "/$(pwd)/log://var/lib/jenkins/log" \
+--volume "/$(pwd)/src://src" \
+docker-registry.wikimedia.org/releng/composer-package:latest
diff --git a/dockerfiles/composer-package/run.sh 
b/dockerfiles/composer-package/run.sh
old mode 100644
new mode 100755
index 161247c..0015c37
--- a/dockerfiles/composer-package/run.sh
+++ b/dockerfiles/composer-package/run.sh
@@ -8,4 +8,4 @@
 
 composer --ansi validate
 composer install --no-progress --prefer-dist
-composer test
+exec composer test
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index bcf53b5..9c5c2e2 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -267,7 +267,7 @@
 - php55:
 image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
 - php70:
-image: wmfreleng/composer-package:v2017.10.28.07.05
+image: 
docker-registry.wikimedia.org/releng/composer-package:0.1.0
 - '{name}-composer-{phpflavor}-docker':
 phpflavor:
 - hhvm:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 7d8ebf4..b83d120 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -207,7 +207,7 @@
 - php55:
 image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
 - php70:
-image: wmfreleng/composer-package:v2017.10.28.07.05
+image: 

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate composer to docker-pkg

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403642 )

Change subject: Migrate composer to docker-pkg
..

Migrate composer to docker-pkg

Change-Id: Ieaee9bc2714cc065399de093710c3253b240d5f9
---
D dockerfiles/composer/Dockerfile
A dockerfiles/composer/Dockerfile.template
A dockerfiles/composer/changelog
A dockerfiles/composer/control
D dockerfiles/composer/prebuild.sh
5 files changed, 22 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/42/403642/1

diff --git a/dockerfiles/composer/Dockerfile b/dockerfiles/composer/Dockerfile
deleted file mode 100644
index ad8f92a..000
--- a/dockerfiles/composer/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM docker-registry.wikimedia.org/releng/php:latest
-
-USER root
-
-COPY .cache-buster-composer /.cache-buster-composer
-
-RUN git clone --depth 1 
https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \
-rm -rf /srv/composer/.git
-RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
-
-USER nobody
-
-# If a later dockerfile enables xdebug, don't
-# spam warnings about it.
-ENV COMPOSER_DISABLE_XDEBUG_WARN=1
-
-ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
-CMD ["help"]
diff --git a/dockerfiles/composer/Dockerfile.template 
b/dockerfiles/composer/Dockerfile.template
new file mode 100644
index 000..d9afb83
--- /dev/null
+++ b/dockerfiles/composer/Dockerfile.template
@@ -0,0 +1,16 @@
+FROM {{ "php" | image_tag }}
+
+USER root
+
+RUN git clone --depth 1 
https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer \
+&& rm -rf /srv/composer/.git \
+&& ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+
+USER nobody
+
+# If a later dockerfile enables xdebug, don't
+# spam warnings about it.
+ENV COMPOSER_DISABLE_XDEBUG_WARN=1
+
+ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
+CMD ["help"]
diff --git a/dockerfiles/composer/changelog b/dockerfiles/composer/changelog
new file mode 100644
index 000..3eb67f1
--- /dev/null
+++ b/dockerfiles/composer/changelog
@@ -0,0 +1,5 @@
+composer (0.1.0) wikimedia; urgency=medium
+
+  * Initial port to docker-pkg.
+
+ -- Antoine Musso   Thu, 11 Jan 2018 14:15:46 +0100
diff --git a/dockerfiles/composer/control b/dockerfiles/composer/control
new file mode 100644
index 000..4be4b08
--- /dev/null
+++ b/dockerfiles/composer/control
@@ -0,0 +1 @@
+Depends: php
diff --git a/dockerfiles/composer/prebuild.sh b/dockerfiles/composer/prebuild.sh
deleted file mode 100755
index ef2e5ca..000
--- a/dockerfiles/composer/prebuild.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# This is copied in Dockerfile to ensure that a build step grabs a fresh
-# copy of the git repo when it is updated rather than using a layer from
-# the local Docker cache.
-
-git ls-remote --exit-code 
https://gerrit.wikimedia.org/r/p/integration/composer.git refs/heads/master > 
.cache-buster-composer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaee9bc2714cc065399de093710c3253b240d5f9
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Clean out rake-jessie legacy bits

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403632 )

Change subject: Clean out rake-jessie legacy bits
..

Clean out rake-jessie legacy bits

The last use case is mediawiki/vagrant.
* remove the template and directly use a job
* rename a variable in tests
* delete 'rake-jessie'

Change-Id: I5ac1ad8e2b66fb699d1d5baed326ea30a7ef2369
---
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
M tests/test_zuul_scheduler.py
3 files changed, 18 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/403632/1

diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index c173652..b555975 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -30,13 +30,27 @@
  - '{name}-bundle-yard-publish'
  - '{name}-rake-docker'
 
+# Run `bundle exec rake test` on Nodepool Jessie instances.
+- job:
+name: 'mediawiki-vagrant-rake-jessie'
+node: ci-jessie-wikimedia
+defaults: use-remote-zuul-shallow-clone
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - castor-load
+ - bundle-nodepool:
+ command: rake test
+publishers:
+ - castor-save
+
 - project:
 name: 'mediawiki-vagrant'
 jobs:
  - '{name}-rake-docker':
  docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.0
  build_timeout: 10  # minutes
- - '{name}-rake-jessie'
  - 'mediawiki-vagrant-puppet-doc-publish'
 
 - project:
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 460db01..7af5fa4 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -35,33 +35,10 @@
 triggers:
 - zuul
 
-# Run `bundle exec rake test` on Nodepool Jessie instances.
-- job: _rake-jessie
-name: 'rake-jessie'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
-concurrent: true
-triggers:
- - zuul
-builders:
- - castor-load
- - bundle-nodepool:
- command: rake test
-publishers:
- - castor-save
-
-- job-template:
-!!merge : *job_rake-jessie
-name: '{name}-rake-jessie'
-# Reinject Zuul parameters since JJB strip for some reason
-triggers:
- - zuul
-
 - project:
 name: common-rake-job
 jobs:
  - rake-docker
- - rake-jessie
 
 # Call bundle 'yard' to generate documentation in labs and publish to
 # doc.wikimedia.org using an intermediate rsync repository in labs.
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 60fd5a2..056db8b 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -656,7 +656,7 @@
 jobs_tree = [t for (p, t) in
  self.getPipeline('test').job_trees.iteritems()
  if p.name == 'mediawiki/ruby/api'][0]
-rake_jessie_job = [j for j in jobs_tree.getJobs()
+rake_docker_job = [j for j in jobs_tree.getJobs()
if j.name.endswith('rake-docker')][0]
 
 def change_with_files(files):
@@ -681,11 +681,11 @@
 try:
 if expect:
 self.assertTrue(
-rake_jessie_job.changeMatches(change),
+rake_docker_job.changeMatches(change),
 'rake-docker should run with files: %s' % files)
 else:
 self.assertFalse(
-rake_jessie_job.changeMatches(change),
+rake_docker_job.changeMatches(change),
 'rake-docker should NOT run with files: %s' % files)
 except AssertionError, e:
 errors.append(str(e))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ac1ad8e2b66fb699d1d5baed326ea30a7ef2369
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Delete mwgate-rake-jessie

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403631 )

Change subject: Delete mwgate-rake-jessie
..

Delete mwgate-rake-jessie

It is no more triggered since d23ea1db. Has been replaced by
mwgate-rake-docker.

Change-Id: Icbbdf6f35b2d7868321809b77ebfee708871e16f
---
M jjb/mediawiki.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/31/403631/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 5a9ea15..bcf53b5 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -283,7 +283,6 @@
 - php55
 - php56
 - '{name}-rake-docker'
-- '{name}-rake-jessie'
 - '{name}-tox-docker'
 - '{name}-npm-node-6-docker'
 - '{name}-npm-browser-node-6-docker'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbbdf6f35b2d7868321809b77ebfee708871e16f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate mwgate-rake to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403630 )

Change subject: Migrate mwgate-rake to Docker
..

Migrate mwgate-rake to Docker

mediawiki/skins/MinervaNeue
mediawiki/extensions/CentralAuth
mediawiki/extensions/CentralNotice
mediawiki/extensions/Flow
mediawiki/extensions/GettingStarted
mediawiki/extensions/Math
mediawiki/extensions/MobileFrontend
mediawiki/extensions/MultimediaViewer
mediawiki/extensions/PageTriage
mediawiki/extensions/QuickSurveys
mediawiki/extensions/PoolCounter
mediawiki/extensions/Wikibase

Change-Id: I280b1470ebf47e679136bd94bb5691fff522f126
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/30/403630/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2aa6957..5dc30c4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1260,10 +1260,8 @@
 
   - name: mwgate-rake
 test:
-  - mwgate-rake-jessie
+  - mwgate-rake-docker
 gate-and-submit:
-  - mwgate-rake-jessie
-experimental:
   - mwgate-rake-docker
 
   - name: mwext-ruby-jessie

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I280b1470ebf47e679136bd94bb5691fff522f126
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...QuickSurveys[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403624 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys 
refs/changes/24/403624/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/403624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: volans: getconf ARG_MAX

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403617 )

Change subject: volans: getconf ARG_MAX
..

volans: getconf ARG_MAX

Change-Id: I818cff21ca5df68b3e18e63824d87fc6af72bdd3
---
M Rakefile
1 file changed, 3 insertions(+), 121 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/403617/1

diff --git a/Rakefile b/Rakefile
index d13815e..32934fc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,122 +1,4 @@
-# This rakefile is meant to run linters and tests
-# tailored to a specific changeset.
-# You will need 'bundler' to install dependencies:
-#
-#  $ apt-get install bundler
-#  $ bundle install
-#
-# Then run all the tests, in parallel, that are pertinent to the current 
changeset
-#
-#   $ bundle exec rake test
-#
-# If you just want to check which tests would be ran, run
-#
-#   $ bundle exec rake debug
-#
-# Based on the contents of the change, this rakefile will define and run
-# all or just some of the following tests:
-#
-# * puppet_lint - runs puppet lint on the changed puppet files
-# * typos - checks the changed files against a predefined list of typos defined
-#in ./typos
-# * syntax - run syntax checks for puppet files, hiera files, and templates
-#changed in the current changeset
-# * rubocop - run rubocop style checks on ruby files changed in this changeset
-# * spec - run the spec tests on the modules where files are changed, or whose
-#   tests depend on modules that have been modified.
-# * tox - run the tox tests if needed.
-#
-require 'git'
-require 'set'
-require 'rake'
-require 'rake/tasklib'
-require 'shellwords'
-
-# Needed by docs
-require 'puppet-strings/tasks/generate'
-$LOAD_PATH.unshift File.expand_path('.')
-require 'rake_modules/taskgen'
-
-t = TaskGen.new('.')
-
-multitask :parallel => t.tasks
-desc 'Run all actual tests in parallel for changes in HEAD'
-task :test => [:parallel, :wmf_styleguide_delta]
-
-# Show what we would run
-task :debug do
-  puts "Tasks that would be run: "
-  puts t.tasks
-end
-
-# Global tasks. Only the ones deemed useful are added here.
-namespace :global do
-  desc "Build documentation"
-  task :doc do
-Rake::Task['strings:generate'].invoke(
-  '**/*.pp **/*.rb',  # patterns
-  'false', # debug
-  'false', # backtrace
-  'rdoc',  # markup format
-)
-  end
-
-  spec_failed = []
-  spec_tasks = []
-  namespace :spec do
-FileList['modules/*/spec'].each do |path|
-  next unless path.match('modules/(.+)/')
-  module_name = Regexp.last_match(1)
-  task module_name do
-spec_result = system("cd 'modules/#{module_name}' && rake spec")
-spec_failed << module_name unless spec_result
-  end
-  spec_tasks << "spec:#{module_name}"
-end
-  end
-  desc "Run all spec tests found in modules"
-  multitask :spec => spec_tasks do
-raise "Modules that failed to pass the spec tests: #{spec_failed.join ', 
'}" unless spec_failed.empty?
-  end
-
-  desc 'Run the wmf style guide check on all files, or on a single module 
(with module=)'
-  task :wmf_style do
-if ENV['module']
-  pattern = "modules/#{ENV['module']}/**/*.pp"
-else
-  pattern = '**/*.pp'
-end
-
-t.setup_wmf_lint_check
-linter = PuppetLint.new
-FileList[pattern].to_a.each do |puppet_file|
-  linter.file = puppet_file
-  linter.run
-  next if linter.problems.empty?
-
-  if ENV.key?('JENKINS_URL')
-  t.print_wmf_style_violations linter.problems, nil, 
'%{path}:%{line}:%{check}:%{KIND}:%{message}'
-  else
-  t.print_wmf_style_violations linter.problems
-  end
-end
-  end
-end
-
-desc 'Show the help'
-task :help do
-  puts "Puppet helper for operations/puppet.git
-
-Welcome #{ENV['USER']} to WMFs wonderful rake helper to play with puppet.
-
[Command line options]--
-`rake -T` : list available tasks
-`rake -P` : shows tasks dependencies
-
[Available rake tasks]--"
-
-  # Show our tasks list.
-  system "rake -T"
-
-  puts 
"---"
+task :test do
+puts "volans: getconf ARG_MAX is:"
+system('getconf ARG_MAX')
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I818cff21ca5df68b3e18e63824d87fc6af72bdd3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/quibble[master]: The quibble script is the ENTRYPOINT

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403540 )

Change subject: The quibble script is the ENTRYPOINT
..

The quibble script is the ENTRYPOINT

Change-Id: I72250fe2c44fc978e08e2603bab772478d7bdd67
---
M Dockerfile
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/quibble 
refs/changes/40/403540/1

diff --git a/Dockerfile b/Dockerfile
index 44d35e1..caec70e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,3 +36,4 @@
 RUN install --directory /workspace --owner=nobody --group=nogroup
 USER nobody
 WORKDIR /workspace
+ENTRYPOINT ["/usr/local/bin/quibble"]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72250fe2c44fc978e08e2603bab772478d7bdd67
Gerrit-PatchSet: 1
Gerrit-Project: integration/quibble
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/quibble[master]: Update ci-jessie docker image

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403539 )

Change subject: Update ci-jessie docker image
..

Update ci-jessie docker image

It is now on the Wikimedia Docker registry.

Change-Id: I6f8a720de85e8186ad9052f6bc507a4a63763508
---
M Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/quibble 
refs/changes/39/403539/1

diff --git a/Dockerfile b/Dockerfile
index 157dc79..44d35e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM wmfreleng/ci-jessie
+FROM docker-registry.wikimedia.org/releng/ci-jessie:latest
 
 ARG DEBIAN_FRONTEND=noninteractive
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f8a720de85e8186ad9052f6bc507a4a63763508
Gerrit-PatchSet: 1
Gerrit-Project: integration/quibble
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Cache bundler installed material between runs

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403471 )

Change subject: Cache bundler installed material between runs
..

Cache bundler installed material between runs

Point bundler to install to XDG_CACHE_HOME, this way the gems get saved
between runs, specially the native extensions which are quite slow to
build.

Update docker containers rake and rake-vagrant
Examples now use a cache volume

Change-Id: I006c3cb5728b69c086f932adb70e22501d55a47e
---
M dockerfiles/rake-vagrant/changelog
M dockerfiles/rake-vagrant/example-run.sh
M dockerfiles/rake/changelog
M dockerfiles/rake/example-run.sh
M dockerfiles/rake/run.sh
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
7 files changed, 24 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/71/403471/1

diff --git a/dockerfiles/rake-vagrant/changelog 
b/dockerfiles/rake-vagrant/changelog
index 25a29b0..daf 100644
--- a/dockerfiles/rake-vagrant/changelog
+++ b/dockerfiles/rake-vagrant/changelog
@@ -1,3 +1,12 @@
+rake-vagrant (0.2.0) wikimedia; urgency=medium
+
+  * Rebuild based on rake:0.1.1:
+  > bundle install to $XDG_CACHE_HOME so the material can be cached between
+  > runs.
+  > pass --clean to have obsolete material to be reclaimed automatically.
+
+ -- Antoine Musso   Wed, 10 Jan 2018 20:59:38 +0100
+
 rake-vagrant (0.1.0) wikimedia; urgency=medium
 
   * Initial release.
diff --git a/dockerfiles/rake-vagrant/example-run.sh 
b/dockerfiles/rake-vagrant/example-run.sh
index 797f7ac..21600be 100755
--- a/dockerfiles/rake-vagrant/example-run.sh
+++ b/dockerfiles/rake-vagrant/example-run.sh
@@ -2,6 +2,7 @@
 
 set -euxo pipefail
 
+install --mode 2777 --directory cache
 install --mode 2777 --directory log
 docker run \
 --rm --tty \
@@ -9,5 +10,6 @@
 --env ZUUL_URL=https://gerrit.wikimedia.org/r \
 --env ZUUL_PROJECT=mediawiki/vagrant \
 --env ZUUL_REF=refs/changes/03/403403/2 \
+--volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/log://log \
 docker-registry.wikimedia.org/releng/rake-vagrant:latest
diff --git a/dockerfiles/rake/changelog b/dockerfiles/rake/changelog
index a11e5ba..627706c 100644
--- a/dockerfiles/rake/changelog
+++ b/dockerfiles/rake/changelog
@@ -1,3 +1,11 @@
+rake (0.2.0) wikimedia; urgency=medium
+
+  * bundle install to $XDG_CACHE_HOME so the material can be cached between
+runs.
+  * pass --clean to have obsolete material to be reclaimed automatically.
+
+ -- Antoine Musso   Wed, 10 Jan 2018 20:58:41 +0100
+
 rake (0.1.0) wikimedia; urgency=medium
 
   * Initial release.
diff --git a/dockerfiles/rake/example-run.sh b/dockerfiles/rake/example-run.sh
index 89ba873..6a6c409 100755
--- a/dockerfiles/rake/example-run.sh
+++ b/dockerfiles/rake/example-run.sh
@@ -2,6 +2,7 @@
 
 set -euxo pipefail
 
+install --mode 2777 --directory cache
 install --mode 2777 --directory log
 docker run \
 --rm --tty \
@@ -10,5 +11,6 @@
 --env ZUUL_PROJECT=mediawiki/ruby/api \
 --env ZUUL_COMMIT=master \
 --env ZUUL_REF=master \
+--volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/log://log \
 docker-registry.wikimedia.org/releng/rake:latest
diff --git a/dockerfiles/rake/run.sh b/dockerfiles/rake/run.sh
index b2f942b..4d8e852 100755
--- a/dockerfiles/rake/run.sh
+++ b/dockerfiles/rake/run.sh
@@ -11,5 +11,5 @@
 git checkout --quiet FETCH_HEAD
 git submodule --quiet update --init --recursive
 
-bundle install --path .bundle
+bundle install --clean --path "${XDG_CACHE_HOME}/bundle"
 exec bundle exec rake test
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 41d5920..c173652 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -34,7 +34,7 @@
 name: 'mediawiki-vagrant'
 jobs:
  - '{name}-rake-docker':
- docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.1.0
+ docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.0
  build_timeout: 10  # minutes
  - '{name}-rake-jessie'
  - 'mediawiki-vagrant-puppet-doc-publish'
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index c07e3c0..460db01 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -11,7 +11,7 @@
 name: 'rake-docker'
 node: DebianJessieDocker
 concurrent: true
-docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.1.0'
+docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.2.0'
 triggers:
 - zuul
 builders:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I006c3cb5728b69c086f932adb70e22501d55a47e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump mediawiki/vagrant build timeout

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403467 )

Change subject: Bump mediawiki/vagrant build timeout
..

Bump mediawiki/vagrant build timeout

With a cold cache, it takes a while to install all dependencies.

Change-Id: I990c0f6b4c0b45d6a2a13ea54a074092c80773e8
---
M jjb/mediawiki-misc.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/67/403467/1

diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index a92f685..41d5920 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -35,6 +35,7 @@
 jobs:
  - '{name}-rake-docker':
  docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.1.0
+ build_timeout: 10  # minutes
  - '{name}-rake-jessie'
  - 'mediawiki-vagrant-puppet-doc-publish'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I990c0f6b4c0b45d6a2a13ea54a074092c80773e8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: specific image for mediawiki/vagrant

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403462 )

Change subject: docker: specific image for mediawiki/vagrant
..

docker: specific image for mediawiki/vagrant

It requires rsync and zlib.

mediawiki/vagrant master branch would fail due to vagrant 1.8.1 which
cant be used with ruby 2.3 on stretch.
Once the stretch-migration branch get merged AND vagrant is bumped to
1.9.2 (Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81) the suite will pass
just fine has shown by the example-run.sh

Update:
mediawiki-vagrant-rake-docker

Change-Id: I37332733b2c8f64c7a643ad3858e3de96a471a5e
---
A dockerfiles/rake-vagrant/.dockerignore
A dockerfiles/rake-vagrant/.gitignore
A dockerfiles/rake-vagrant/Dockerfile.template
A dockerfiles/rake-vagrant/changelog
A dockerfiles/rake-vagrant/control
A dockerfiles/rake-vagrant/example-run.sh
M jjb/mediawiki-misc.yaml
7 files changed, 31 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/62/403462/1

diff --git a/dockerfiles/rake-vagrant/.dockerignore 
b/dockerfiles/rake-vagrant/.dockerignore
new file mode 100644
index 000..31dbbff
--- /dev/null
+++ b/dockerfiles/rake-vagrant/.dockerignore
@@ -0,0 +1 @@
+/log
diff --git a/dockerfiles/rake-vagrant/.gitignore 
b/dockerfiles/rake-vagrant/.gitignore
new file mode 100644
index 000..31dbbff
--- /dev/null
+++ b/dockerfiles/rake-vagrant/.gitignore
@@ -0,0 +1 @@
+/log
diff --git a/dockerfiles/rake-vagrant/Dockerfile.template 
b/dockerfiles/rake-vagrant/Dockerfile.template
new file mode 100644
index 000..97ca4ac
--- /dev/null
+++ b/dockerfiles/rake-vagrant/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "rake" | image_tag }}
+
+USER root
+RUN {{ "rsync zlib1g-dev" | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/rake-vagrant/changelog 
b/dockerfiles/rake-vagrant/changelog
new file mode 100644
index 000..25a29b0
--- /dev/null
+++ b/dockerfiles/rake-vagrant/changelog
@@ -0,0 +1,5 @@
+rake-vagrant (0.1.0) wikimedia; urgency=medium
+
+  * Initial release.
+
+ -- Antoine Musso   Wed, 10 Jan 2018 18:43:53 +0100
diff --git a/dockerfiles/rake-vagrant/control b/dockerfiles/rake-vagrant/control
new file mode 100644
index 000..88b51d3
--- /dev/null
+++ b/dockerfiles/rake-vagrant/control
@@ -0,0 +1,3 @@
+Package: rake-vagrant
+Description: ruby on a stretch image
+Depends: rake
diff --git a/dockerfiles/rake-vagrant/example-run.sh 
b/dockerfiles/rake-vagrant/example-run.sh
new file mode 100755
index 000..797f7ac
--- /dev/null
+++ b/dockerfiles/rake-vagrant/example-run.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+install --mode 2777 --directory log
+docker run \
+--rm --tty \
+--env JENKINS_URL=1 \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=mediawiki/vagrant \
+--env ZUUL_REF=refs/changes/03/403403/2 \
+--volume /"$(pwd)"/log://log \
+docker-registry.wikimedia.org/releng/rake-vagrant:latest
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 43f32c4..a92f685 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -33,7 +33,8 @@
 - project:
 name: 'mediawiki-vagrant'
 jobs:
- - '{name}-rake-docker'
+ - '{name}-rake-docker':
+ docker_image_var: 
docker-registry.wikimedia.org/releng/rake-vagrant:0.1.0
  - '{name}-rake-jessie'
  - 'mediawiki-vagrant-puppet-doc-publish'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37332733b2c8f64c7a643ad3858e3de96a471a5e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Bump Vagrant gem version to the one used in Stretch

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403403 )

Change subject: Bump Vagrant gem version to the one used in Stretch
..

Bump Vagrant gem version to the one used in Stretch

Debian stretch ships vagrant 1.9.1. Bump the tag from 1.8.1 to 1.9.1.

Change-Id: Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81
---
M Gemfile
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/03/403403/1

diff --git a/Gemfile b/Gemfile
index 0e63da2..2e65b76 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
 group :development do
+  # The versions should be kept in sync with the ones provided in Debian
+
   # Upstream no more updates rubygems.org and we need a more recent version
   # https://github.com/mitchellh/vagrant/issues/5546
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.9.1'
   gem 'rubocop', '~> 0.51', require: false
   gem 'puppet', '~> 4.8.2'
   gem 'puppet-lint', '2.3.3'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate ruby/api and selenium rake job to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403398 )

Change subject: Migrate ruby/api and selenium rake job to Docker
..

Migrate ruby/api and selenium rake job to Docker

Use more specific jobs since they exists.
Drop the Zuul 'rake' template since it is not more used.

The Docker based jobs passed on:
https://gerrit.wikimedia.org/r/#/c/330671/
https://gerrit.wikimedia.org/r/#/c/118455/

Change-Id: I7c3136a18fee96d6cd7a021299d6626b4afc1737
---
M zuul/layout.yaml
1 file changed, 6 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/98/403398/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ed1b4ae..2aa6957 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1258,15 +1258,6 @@
 gate-and-submit:
   - mwgate-npm-node-6-docker
 
-  - name: rake
-test:
-  - rake-jessie
-gate-and-submit: 
-  - rake-jessie
-gate-and-submit-swat: *rake-gate-and-submit
-experimental:
-  - rake-docker
-
   - name: mwgate-rake
 test:
   - mwgate-rake-jessie
@@ -1841,17 +1832,19 @@
  - integration-docroot-deploy
 
   - name: mediawiki/ruby/api
-template:
-  - name: rake
+test:
+  - mediawiki-ruby-api-rake-docker
+gate-and-submit:
+  - mediawiki-ruby-api-rake-docker
 postmerge:
  - mediawiki-ruby-api-bundle-yard-publish
 
   - name: mediawiki/selenium
-template:
-  - name: rake
 test:
+ - mediawiki-selenium-rake-docker
  - mediawiki-selenium-integration-jessie
 gate-and-submit:
+ - mediawiki-selenium-rake-docker
  - mediawiki-selenium-integration-jessie
 postmerge:
  - mediawiki-selenium-bundle-yard-publish

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c3136a18fee96d6cd7a021299d6626b4afc1737
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate translatewiki rake job to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403383 )

Change subject: Migrate translatewiki rake job to Docker
..

Migrate translatewiki rake job to Docker

Passed on https://gerrit.wikimedia.org/r/#/c/403381/

Change-Id: Ie0ed9dca419dca73193b430851378cb6a3f246cc
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/83/403383/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 0d1e574..1481291 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -370,7 +370,6 @@
 jobs:
  - '{name}-composer-hhvm-jessie'
  - '{name}-rake-docker'
- - '{name}-rake-jessie'
 
 # Find out common typos in any files based on list of typos in a /typos file
 - job-template:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 69022b4..ed1b4ae 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -774,7 +774,7 @@
   - '.*'
 
   # Ditto for translatewiki which has puppet modules under /puppet
-  - name: ^translatewiki-rake-(docker|jessie)$
+  - name: ^translatewiki-rake-docker$
 files:
   - '^\.puppet-lint\.rc$'
   - '^puppet/.*'
@@ -2667,13 +2667,11 @@
 
   - name: translatewiki
 test:
-  - translatewiki-rake-jessie
+  - translatewiki-rake-docker
   - translatewiki-composer-hhvm-jessie
 gate-and-submit:
-  - translatewiki-rake-jessie
-  - translatewiki-composer-hhvm-jessie
-experimental:
   - translatewiki-rake-docker
+  - translatewiki-composer-hhvm-jessie
 
   - name: wikimedia-ui-base
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0ed9dca419dca73193b430851378cb6a3f246cc
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate oojs/ui rake job to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403382 )

Change subject: Migrate oojs/ui rake job to Docker
..

Migrate oojs/ui rake job to Docker

Passed on https://gerrit.wikimedia.org/r/#/c/285972/

Change-Id: If0ad01d2419cad3beea0c4e6b04efc550bc9909e
---
M jjb/oojs.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/82/403382/1

diff --git a/jjb/oojs.yaml b/jjb/oojs.yaml
index 8997653..00cc682 100644
--- a/jjb/oojs.yaml
+++ b/jjb/oojs.yaml
@@ -6,7 +6,6 @@
 script:
 - jenkins
 - '{name}-rake-docker'
-- '{name}-rake-jessie'
 
 - project:
 name: oojs-core
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0f8d549..69022b4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7930,19 +7930,17 @@
 # composer hhvm is already run by npm-run-jenkins T155483
 test:
   - oojs-ui-npm-run-jenkins-node-6-jessie
-  - oojs-ui-rake-jessie
+  - oojs-ui-rake-docker
   - composer-package-php55-docker
 gate-and-submit:
   - oojs-ui-npm-run-jenkins-node-6-jessie
-  - oojs-ui-rake-jessie
+  - oojs-ui-rake-docker
   - composer-package-php55-docker
 postmerge:
   - oojs-ui-jsduck-publish
   - oojs-ui-doxygen-publish
   - oojs-ui-coverage
   - oojs-ui-demos-publish
-experimental:
-  - oojs-ui-rake-docker
 
   - name: sink_nova_ldap
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0ad01d2419cad3beea0c4e6b04efc550bc9909e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403381 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/81/403381/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/403381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate wmf_styleguide-check rake job to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403379 )

Change subject: Migrate wmf_styleguide-check rake job to Docker
..

Migrate wmf_styleguide-check rake job to Docker

Passed on https://gerrit.wikimedia.org/r/#/c/403373/

Change-Id: Ieb268e65f7cad5c2d4afb997b54ff8024e5c2f9b
---
M jjb/operations-puppet.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/79/403379/1

diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 3f1f3d3..14724d8 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -140,4 +140,3 @@
 name: puppet-wmf-styleguide
 jobs:
 - '{name}-rake-docker'
-- '{name}-rake-jessie'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6252ee2..0f8d549 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2496,10 +2496,8 @@
 
   - name: operations/puppet-lint/wmf_styleguide-check
 test:
-  - puppet-wmf-styleguide-rake-jessie
+  - puppet-wmf-styleguide-rake-docker
 gate-and-submit:
-  - puppet-wmf-styleguide-rake-jessie
-experimental:
   - puppet-wmf-styleguide-rake-docker
 
   - name: operations/puppet/cdh

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb268e65f7cad5c2d4afb997b54ff8024e5c2f9b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate puppet modules rake jobs to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403377 )

Change subject: Migrate puppet modules rake jobs to Docker
..

Migrate puppet modules rake jobs to Docker

Change-Id: I30dc81a03fbc31d19b52ee4d705e8ed244271b8d
---
M jjb/operations-puppet.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/77/403377/1

diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 05eef3b..3f1f3d3 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -123,7 +123,7 @@
 - project:
 name: 'puppet-modules'
 jobs:
- - '{name}-rake-docker': _modules
+ - '{name}-rake-docker':
  name:
   - puppet-cdh
   - puppet-cdh4
@@ -135,7 +135,6 @@
   - puppet-varnishkafka
   - puppet-wikimetrics
   - puppet-zookeeper
- - '{name}-rake-jessie': *puppet_modules
 
 - project:
 name: puppet-wmf-styleguide
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 52192f0..6252ee2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1291,10 +1291,8 @@
 
   - name: puppet-module
 test:
-  - puppet-{name}-rake-jessie
+  - puppet-{name}-rake-docker
 gate-and-submit:
-  - puppet-{name}-rake-jessie
-experimental:
   - puppet-{name}-rake-docker
 
   - name: tox-docker

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30dc81a03fbc31d19b52ee4d705e8ed244271b8d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403375 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I91adad7460d6db399dcb627b6ef4deaaef50523a
---
A JENKINS
A wrong.pp
2 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/75/403375/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/wrong.pp b/wrong.pp
new file mode 100644
index 000..bdae7ab
--- /dev/null
+++ b/wrong.pp
@@ -0,0 +1 @@
+I am not a valid manifest

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91adad7460d6db399dcb627b6ef4deaaef50523a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: puppet-module need a Docker rake experimental job

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403374 )

Change subject: puppet-module need a Docker rake experimental job
..

puppet-module need a Docker rake experimental job

Change-Id: Ib96cdfe5f3d1f76c7be63acc99515c7a66aae6a4
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/74/403374/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a523cba..52192f0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1295,7 +1295,7 @@
 gate-and-submit:
   - puppet-{name}-rake-jessie
 experimental:
-  - puppet-{name}-rake-jessie
+  - puppet-{name}-rake-docker
 
   - name: tox-docker
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib96cdfe5f3d1f76c7be63acc99515c7a66aae6a4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: puppet-module need a Docker rake experimental job

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403374 )

Change subject: puppet-module need a Docker rake experimental job
..


puppet-module need a Docker rake experimental job

Change-Id: Ib96cdfe5f3d1f76c7be63acc99515c7a66aae6a4
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a523cba..52192f0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1295,7 +1295,7 @@
 gate-and-submit:
   - puppet-{name}-rake-jessie
 experimental:
-  - puppet-{name}-rake-jessie
+  - puppet-{name}-rake-docker
 
   - name: tox-docker
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib96cdfe5f3d1f76c7be63acc99515c7a66aae6a4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...wmf_styleguide-check[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403373 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/puppet-lint/wmf_styleguide-check 
refs/changes/73/403373/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/403373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet-lint/wmf_styleguide-check
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...jmxtrans[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403372 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/jmxtrans 
refs/changes/72/403372/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/403372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/jmxtrans
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate VisualEditor rake job to Docker

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403371 )

Change subject: Migrate VisualEditor rake job to Docker
..

Migrate VisualEditor rake job to Docker

Passed on https://gerrit.wikimedia.org/r/#/c/163846/

Change-Id: Ia070030cf51f1159abed651159ceefe55ae65e09
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/71/403371/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 1e78e84..0d1e574 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -246,7 +246,6 @@
 - '{name}-npm-run-{script}-node-6-docker':
script: 'doc'
 - '{name}-rake-docker'
-- '{name}-rake-jessie'
 
 - job:
 name: 'performance-webpagetest-wmf'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dcb0690..a523cba 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7973,15 +7973,13 @@
 test:
   - visualeditor-npm-browser-node-6-docker
   - visualeditor-npm-run-doc-node-6-docker
-  - visualeditor-rake-jessie
+  - visualeditor-rake-docker
 gate-and-submit:
   - visualeditor-npm-browser-node-6-docker
   - visualeditor-npm-run-doc-node-6-docker
-  - visualeditor-rake-jessie
+  - visualeditor-rake-docker
 postmerge:
   - visualeditor-coverage
-experimental:
-  - visualeditor-rake-docker
 
   - name: wikidata/query/rdf
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia070030cf51f1159abed651159ceefe55ae65e09
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Allow empty /log for rake jobs

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403368 )

Change subject: Allow empty /log for rake jobs
..

Allow empty /log for rake jobs

Change-Id: I586d83f94167a43052fbeedbb1d2b2253a2c66ff
---
M jjb/ruby-jobs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/68/403368/1

diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index f574d5a..c07e3c0 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -26,7 +26,7 @@
 - timestamps
 - ansicolor
 publishers:
-- archive-log-dir
+- archive-log-allow-empty
 - castor-save-workspace-cache
 
 - job-template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I586d83f94167a43052fbeedbb1d2b2253a2c66ff
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add experimental Docker rake jobs

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403367 )

Change subject: Add experimental Docker rake jobs
..

Add experimental Docker rake jobs

Create:
mediawiki-ruby-api-rake-docker
mediawiki-selenium-rake-docker
mediawiki-vagrant-rake-docker
mwgate-rake-docker
oojs-ui-rake-docker
puppet-cdh4-rake-docker
puppet-cdh-rake-docker
puppet-jmxtrans-rake-docker
puppet-kafka-rake-docker
puppet-kafkatee-rake-docker
puppet-mariadb-rake-docker
puppet-nginx-rake-docker
puppet-varnishkafka-rake-docker
puppet-wikimetrics-rake-docker
puppet-wmf-styleguide-rake-docker
puppet-zookeeper-rake-docker
rake-docker
translatewiki-rake-docker
visualeditor-rake-docker

Add them to Zuul 'experimental' pipeline.

Change-Id: I1d79c853175cc43e161968187d1474baf2394ef9
---
M jjb/mediawiki-misc.yaml
M jjb/mediawiki.yaml
M jjb/misc.yaml
M jjb/oojs.yaml
M jjb/operations-puppet.yaml
M jjb/ruby-jobs.yaml
M zuul/layout.yaml
7 files changed, 60 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/67/403367/1

diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index f6f4340..43f32c4 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -22,15 +22,18 @@
  - yard
 jobs:
  - '{name}-bundle-yard-publish'
+ - '{name}-rake-docker'
 
 - project:
 name: 'mediawiki-selenium'
 jobs:
  - '{name}-bundle-yard-publish'
+ - '{name}-rake-docker'
 
 - project:
 name: 'mediawiki-vagrant'
 jobs:
+ - '{name}-rake-docker'
  - '{name}-rake-jessie'
  - 'mediawiki-vagrant-puppet-doc-publish'
 
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 9305af0..5a9ea15 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -282,6 +282,7 @@
 phpflavor:
 - php55
 - php56
+- '{name}-rake-docker'
 - '{name}-rake-jessie'
 - '{name}-tox-docker'
 - '{name}-npm-node-6-docker'
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index f83ccfa..1e78e84 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -245,6 +245,7 @@
 - '{name}-npm-browser-node-6-docker'
 - '{name}-npm-run-{script}-node-6-docker':
script: 'doc'
+- '{name}-rake-docker'
 - '{name}-rake-jessie'
 
 - job:
@@ -369,6 +370,7 @@
 
 jobs:
  - '{name}-composer-hhvm-jessie'
+ - '{name}-rake-docker'
  - '{name}-rake-jessie'
 
 # Find out common typos in any files based on list of typos in a /typos file
diff --git a/jjb/oojs.yaml b/jjb/oojs.yaml
index 9a80772..8997653 100644
--- a/jjb/oojs.yaml
+++ b/jjb/oojs.yaml
@@ -5,6 +5,7 @@
 - '{name}-npm-run-{script}-node-6-jessie':
 script:
 - jenkins
+- '{name}-rake-docker'
 - '{name}-rake-jessie'
 
 - project:
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 49098b8..05eef3b 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -123,7 +123,7 @@
 - project:
 name: 'puppet-modules'
 jobs:
- - '{name}-rake-jessie':
+ - '{name}-rake-docker': _modules
  name:
   - puppet-cdh
   - puppet-cdh4
@@ -135,7 +135,10 @@
   - puppet-varnishkafka
   - puppet-wikimetrics
   - puppet-zookeeper
+ - '{name}-rake-jessie': *puppet_modules
+
 - project:
 name: puppet-wmf-styleguide
 jobs:
+- '{name}-rake-docker'
 - '{name}-rake-jessie'
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index c2dabbc..f574d5a 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -7,6 +7,34 @@
  bundle install --clean
  bundle exec {command}
 
+- job-template: _rake-docker
+name: 'rake-docker'
+node: DebianJessieDocker
+concurrent: true
+docker_image_var: 'docker-registry.wikimedia.org/releng/rake:0.1.0'
+triggers:
+- zuul
+builders:
+- docker-castor-load
+- docker-log-dir
+- docker-run-with-log-and-workspace-cache:
+image: '{obj:docker_image_var}'
+logdir: '/log'
+wrappers:
+- timeout:
+timeout: '{obj:build_timeout|3}'  # minutes
+- timestamps
+- ansicolor
+publishers:
+- archive-log-dir
+- castor-save-workspace-cache
+
+- job-template:
+!!merge : *job_rake-docker
+name: '{name}-rake-docker'
+triggers:
+- zuul
+
 # Run `bundle exec rake test` on Nodepool Jessie instances.
 - job: _rake-jessie
 name: 'rake-jessie'
@@ -32,6 +60,7 @@
 - project:
 name: common-rake-job
 jobs:
+ - rake-docker
  - rake-jessie
 
 # Call bundle 'yard' to generate documentation in labs and publish to
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b0cf5a0..dcb0690 100644
--- a/zuul/layout.yaml
+++ 

[MediaWiki-commits] [Gerrit] integration/config[master]: operations/debs/node-tunnel-agent -> voting debian-glue

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403365 )

Change subject: operations/debs/node-tunnel-agent -> voting debian-glue
..

operations/debs/node-tunnel-agent -> voting debian-glue

Passed on https://gerrit.wikimedia.org/r/#/c/403130/

Bug: T183569
Change-Id: I511c7e1766c308f344a46568f0ea17b1101542d7
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/65/403365/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5a4b585..b0cf5a0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2260,7 +2260,11 @@
   - { name: operations/debs/mwbzutils,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/mysqlatfacebook,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nfsd-ldap,test: 
['debian-glue-non-voting'] }
-  - { name: operations/debs/node-tunnel-agent,test: 
['debian-glue-non-voting'] }
+  - name: operations/debs/node-tunnel-agent
+test:
+  - debian-glue
+gate-and-submit:
+  - debian-glue
   - { name: operations/debs/nodejs,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nodepool, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nutcracker,   test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I511c7e1766c308f344a46568f0ea17b1101542d7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: debian-glkue for operations/debs/node-tunnel-agent

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403362 )

Change subject: debian-glkue for operations/debs/node-tunnel-agent
..

debian-glkue for operations/debs/node-tunnel-agent

Bug: T183569
Change-Id: I862be65c3dcdc2c571f7647bb2eb5fc3cc0cb8d3
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/62/403362/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a62a28d..5a4b585 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2260,6 +2260,7 @@
   - { name: operations/debs/mwbzutils,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/mysqlatfacebook,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nfsd-ldap,test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/node-tunnel-agent,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nodejs,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nodepool, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/nutcracker,   test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I862be65c3dcdc2c571f7647bb2eb5fc3cc0cb8d3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 to wmf.16

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403360 )

Change subject: group0 to wmf.16
..

group0 to wmf.16

That was left uncommited on the deployment server.

Change-Id: I771d6507c26585d391a76377ebd920195274c751
---
M wikiversions.json
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/60/403360/1

diff --git a/wikiversions.json b/wikiversions.json
index 0a236fb..d43cec0 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -446,7 +446,7 @@
 "kywikiquote": "php-1.31.0-wmf.15",
 "kywiktionary": "php-1.31.0-wmf.15",
 "labswiki": "php-1.31.0-wmf.15",
-"labtestwiki": "php-1.31.0-wmf.15",
+"labtestwiki": "php-1.31.0-wmf.16",
 "ladwiki": "php-1.31.0-wmf.15",
 "lawiki": "php-1.31.0-wmf.15",
 "lawikibooks": "php-1.31.0-wmf.15",
@@ -759,9 +759,9 @@
 "tcywiki": "php-1.31.0-wmf.15",
 "techconductwiki": "php-1.31.0-wmf.15",
 "tenwiki": "php-1.31.0-wmf.15",
-"test2wiki": "php-1.31.0-wmf.15",
-"testwiki": "php-1.31.0-wmf.15",
-"testwikidatawiki": "php-1.31.0-wmf.15",
+"test2wiki": "php-1.31.0-wmf.16",
+"testwiki": "php-1.31.0-wmf.16",
+"testwikidatawiki": "php-1.31.0-wmf.16",
 "tetwiki": "php-1.31.0-wmf.15",
 "tewiki": "php-1.31.0-wmf.15",
 "tewikibooks": "php-1.31.0-wmf.15",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I771d6507c26585d391a76377ebd920195274c751
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: 20after4 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: stretch image to run rake

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403311 )

Change subject: docker: stretch image to run rake
..

docker: stretch image to run rake

It fetches changes exactly like I did for tox.

Change-Id: I0af2df2f675a945dc72ed81d82faeaf2c1edb212
---
A dockerfiles/rake/.dockerignore
A dockerfiles/rake/.gitignore
A dockerfiles/rake/Dockerfile.template
A dockerfiles/rake/changelog
A dockerfiles/rake/control
A dockerfiles/rake/example-run.sh
A dockerfiles/rake/run.sh
7 files changed, 45 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/11/403311/1

diff --git a/dockerfiles/rake/.dockerignore b/dockerfiles/rake/.dockerignore
new file mode 100644
index 000..31dbbff
--- /dev/null
+++ b/dockerfiles/rake/.dockerignore
@@ -0,0 +1 @@
+/log
diff --git a/dockerfiles/rake/.gitignore b/dockerfiles/rake/.gitignore
new file mode 100644
index 000..31dbbff
--- /dev/null
+++ b/dockerfiles/rake/.gitignore
@@ -0,0 +1 @@
+/log
diff --git a/dockerfiles/rake/Dockerfile.template 
b/dockerfiles/rake/Dockerfile.template
new file mode 100644
index 000..c871380
--- /dev/null
+++ b/dockerfiles/rake/Dockerfile.template
@@ -0,0 +1,6 @@
+FROM {{ "ci-stretch" | image_tag }}
+RUN {{ "build-essential rubygems-integration rake ruby ruby-dev bundler" | 
apt_install }}
+
+COPY run.sh /run.sh
+USER nobody
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/rake/changelog b/dockerfiles/rake/changelog
new file mode 100644
index 000..a11e5ba
--- /dev/null
+++ b/dockerfiles/rake/changelog
@@ -0,0 +1,5 @@
+rake (0.1.0) wikimedia; urgency=medium
+
+  * Initial release.
+
+ -- Antoine Musso   Tue, 09 Jan 2018 22:34:48 +0100
diff --git a/dockerfiles/rake/control b/dockerfiles/rake/control
new file mode 100644
index 000..643e079
--- /dev/null
+++ b/dockerfiles/rake/control
@@ -0,0 +1,3 @@
+Package: rake
+Description: ruby on a stretch image
+Depends: ci-stretch
diff --git a/dockerfiles/rake/example-run.sh b/dockerfiles/rake/example-run.sh
new file mode 100755
index 000..89ba873
--- /dev/null
+++ b/dockerfiles/rake/example-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+install --mode 2777 --directory log
+docker run \
+--rm --tty \
+--env JENKINS_URL=1 \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=mediawiki/ruby/api \
+--env ZUUL_COMMIT=master \
+--env ZUUL_REF=master \
+--volume /"$(pwd)"/log://log \
+docker-registry.wikimedia.org/releng/rake:latest
diff --git a/dockerfiles/rake/run.sh b/dockerfiles/rake/run.sh
new file mode 100755
index 000..b2f942b
--- /dev/null
+++ b/dockerfiles/rake/run.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+umask 002
+
+cd /src
+
+git init
+git fetch --depth 2 --quiet "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF"
+git checkout --quiet FETCH_HEAD
+git submodule --quiet update --init --recursive
+
+bundle install --path .bundle
+exec bundle exec rake test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0af2df2f675a945dc72ed81d82faeaf2c1edb212
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: Fix a few lintian issues

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403160 )

Change subject: Fix a few lintian issues
..


Fix a few lintian issues

maintainer-also-in-uploaders
ancient-standards-version: 3.9.6 -> 3.9.8
init.d-script-needs-depends-on-lsb-base: add lsb-base dependency
binary-without-manpage:
- usr/bin/zuul-launcher
- usr/bin/zuul-clear-refs
dir-or-file-in-var-run:
- var/run/zuul-merger
- var/run/zuul

Change-Id: Ib9c043200bf0714bf6cad995b6de41360f01bd66
---
M debian/changelog
M debian/control
M debian/dirs
M debian/zuul.lintian-overrides
4 files changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 8b0545b..8bf06a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zuul (2.5.0-8-gcbc7f62-wmf5) jessie-wikimedia; urgency=medium
+
+  * Fix lintian issues
+  * Drop 'jessie1' suffix from the Debian version. We only use jessie right
+now and it is already mentionned in 'jessie-wikimedia'
+
+ -- Antoine Musso   Tue, 09 Jan 2018 15:34:43 +0100
+
 zuul (2.5.0-8-gcbc7f62-wmf4jessie1) jessie-wikimedia; urgency=medium
 
   * sync with precise-wikimedia:
diff --git a/debian/control b/debian/control
index cd9e353..e8f560e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,5 @@
 Source: zuul
 Maintainer: Antoine Musso 
-Uploaders: Antoine Musso 
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
@@ -59,7 +58,7 @@
 #  Debian packaging dependencies
 # #
  python-nose
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 X-Python-Version: = 2.7
 Homepage: https://launchpad.net/zuul
 Vcs-Git: git://github.com/pabelanger/zuul-deb.git
@@ -74,6 +73,7 @@
 Depends: adduser,
  libjs-jquery,
  libjs-underscore,
+ lsb-base (>= 3.0-6),
  python-pbr (>= 0.5.21),
  python-yaml (>= 3.1.0),
  python-paste,
diff --git a/debian/dirs b/debian/dirs
index 731fe5f..68f6c2a 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,5 +2,3 @@
 /var/lib/zuul
 /var/lib/zuul/git
 /var/log/zuul
-/var/run/zuul
-/var/run/zuul-merger
diff --git a/debian/zuul.lintian-overrides b/debian/zuul.lintian-overrides
index 95b8a33..fe60e02 100644
--- a/debian/zuul.lintian-overrides
+++ b/debian/zuul.lintian-overrides
@@ -17,6 +17,8 @@
 
 # No sphinx doc possible with Precise
 zuul binary: binary-without-manpage usr/bin/zuul
+zuul binary: binary-without-manpage usr/bin/zuul-clear-refs
 zuul binary: binary-without-manpage usr/bin/zuul-cloner
+zuul binary: binary-without-manpage usr/bin/zuul-launcher
 zuul binary: binary-without-manpage usr/bin/zuul-merger
 zuul binary: binary-without-manpage usr/bin/zuul-server

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9c043200bf0714bf6cad995b6de41360f01bd66
Gerrit-PatchSet: 2
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add debian-glue to Zuul gate-and-submit

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403172 )

Change subject: Add debian-glue to Zuul gate-and-submit
..

Add debian-glue to Zuul gate-and-submit

Bug: T158243
Change-Id: Ib073a5aa2ca8ce24507776347393ac58df8d0cb8
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/72/403172/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 62200a6..a62a28d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1385,6 +1385,8 @@
   - name: integration/zuul
 test:
   - debian-glue
+gate-and-submit:
+  - debian-glue
 
   - name: mapdata
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib073a5aa2ca8ce24507776347393ac58df8d0cb8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: debian-glue voting for zuul debian/* branches

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403168 )

Change subject: debian-glue voting for zuul debian/* branches
..

debian-glue voting for zuul debian/* branches

Bug: T158243
Change-Id: I4d512504269c38103723f34b531d9df54338d763
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/68/403168/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 84fea07..62200a6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -790,6 +790,8 @@
 skip-if:
   - project: '^integration/uprightdiff$'
 branch: ^master$
+  - project: '^integration/zuul$'
+branch: (?!^debian/)
   - project: '^operations/software/cumin$'
 branch: ^master$
 
@@ -1382,7 +1384,7 @@
 
   - name: integration/zuul
 test:
-  - debian-glue-non-voting
+  - debian-glue
 
   - name: mapdata
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d512504269c38103723f34b531d9df54338d763
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: Fix a few lintian issues

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403160 )

Change subject: Fix a few lintian issues
..

Fix a few lintian issues

maintainer-also-in-uploaders
ancient-standards-version: 3.9.6 -> 3.9.8
init.d-script-needs-depends-on-lsb-base: add lsb-base dependency
binary-without-manpage:
- usr/bin/zuul-launcher
- usr/bin/zuul-clear-refs
dir-or-file-in-var-run:
- var/run/zuul-merger
- var/run/zuul

Change-Id: Ib9c043200bf0714bf6cad995b6de41360f01bd66
---
M debian/changelog
M debian/control
M debian/dirs
M debian/zuul.lintian-overrides
4 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/60/403160/1

diff --git a/debian/changelog b/debian/changelog
index f352ec2..31081df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zuul (2.5.0-8-gcbc7f62-wmf5jessie2) jessie-wikimedia; urgency=medium
+
+  * Fix lintian issues
+
+ -- Antoine Musso   Tue, 09 Jan 2018 15:34:43 +0100
+
 zuul (2.5.0-8-gcbc7f62-wmf5jessie1) jessie-wikimedia; urgency=medium
 
   * debian/source/options ignore a few more files
diff --git a/debian/control b/debian/control
index 93e8e97..b0029a8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,5 @@
 Source: zuul
 Maintainer: Antoine Musso 
-Uploaders: Antoine Musso 
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
@@ -61,7 +60,7 @@
 #  Debian packaging dependencies
 # #
  python-nose
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 X-Python-Version: = 2.7
 Homepage: https://launchpad.net/zuul
 Vcs-Git: git://github.com/pabelanger/zuul-deb.git
@@ -76,6 +75,7 @@
 Depends: adduser,
  libjs-jquery,
  libjs-underscore,
+ lsb-base (>= 3.0-6),
  python-pbr (>= 0.5.21),
  python-yaml (>= 3.1.0),
  python-paste,
diff --git a/debian/dirs b/debian/dirs
index 731fe5f..68f6c2a 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,5 +2,3 @@
 /var/lib/zuul
 /var/lib/zuul/git
 /var/log/zuul
-/var/run/zuul
-/var/run/zuul-merger
diff --git a/debian/zuul.lintian-overrides b/debian/zuul.lintian-overrides
index 95b8a33..fe60e02 100644
--- a/debian/zuul.lintian-overrides
+++ b/debian/zuul.lintian-overrides
@@ -17,6 +17,8 @@
 
 # No sphinx doc possible with Precise
 zuul binary: binary-without-manpage usr/bin/zuul
+zuul binary: binary-without-manpage usr/bin/zuul-clear-refs
 zuul binary: binary-without-manpage usr/bin/zuul-cloner
+zuul binary: binary-without-manpage usr/bin/zuul-launcher
 zuul binary: binary-without-manpage usr/bin/zuul-merger
 zuul binary: binary-without-manpage usr/bin/zuul-server

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9c043200bf0714bf6cad995b6de41360f01bd66
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: debian: ignore some build artifacts from source

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403156 )

Change subject: debian: ignore some build artifacts from source
..


debian: ignore some build artifacts from source

 doc/build/ .testrepository/ AUTHORS Changelog

Change-Id: I66ea69a2633bc95c5bb9d1402c8b13e5b3c03cec
---
M debian/source/options
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/debian/source/options b/debian/source/options
index c7748a3..73d9e54 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
-extend-diff-ignore = "(\.gitreview|\.tox|.+\.egg-info/|.*pyc|((^|/)\.tox))"
+extend-diff-ignore = 
"(\.gitreview|\.tox|.+\.egg-info/|.*pyc|((^|/)\.tox)|doc/build/|\.testrepository/|AUTHORS|Changelog)"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66ea69a2633bc95c5bb9d1402c8b13e5b3c03cec
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: debian: ignore some build artifacts from source

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403156 )

Change subject: debian: ignore some build artifacts from source
..

debian: ignore some build artifacts from source

 doc/build/ .testrepository/ AUTHORS Changelog

Change-Id: I66ea69a2633bc95c5bb9d1402c8b13e5b3c03cec
---
M debian/source/options
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/56/403156/1

diff --git a/debian/source/options b/debian/source/options
index c7748a3..73d9e54 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
-extend-diff-ignore = "(\.gitreview|\.tox|.+\.egg-info/|.*pyc|((^|/)\.tox))"
+extend-diff-ignore = 
"(\.gitreview|\.tox|.+\.egg-info/|.*pyc|((^|/)\.tox)|doc/build/|\.testrepository/|AUTHORS|Changelog)"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66ea69a2633bc95c5bb9d1402c8b13e5b3c03cec
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: Refresh patches for Jessie

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403157 )

Change subject: Refresh patches for Jessie
..

Refresh patches for Jessie

Pin dependencies based on the last deployed build.

Bug: T158243
Change-Id: I9c5407bfa99bffdd4ff4617e26f60ae10b813e33
---
M debian/changelog
M debian/control
R debian/patches/0005-WMF-drop-requirement-ordereddict.patch
D debian/patches/0005-WMF-soften-paramiko-requirement.patch
R debian/patches/0006-Do-not-import-paramiko-before-daemonization.patch
D debian/patches/0006-WMF-soften-WebOb-requirement.patch
R debian/patches/0007-Gerrit-trailing-delay-is-now-configurable.patch
R debian/patches/0008-WMF-constraint-apscheduler-to-3.1.0.patch
R debian/patches/0009-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch
R debian/patches/0010-Add-__repr__-to-a-few-classes.patch
D debian/patches/0010-WMF-soften-pbr-requirement.patch
R debian/patches/0011-Don-t-merge-queues-if-the-common-job-is-noop.patch
R debian/patches/0012-WMF-install-zuul-clear-refs.patch
A debian/patches/0013-WMF-pin-voluptuous-0.10.patch
A debian/patches/0014-WMF-pin-requirements-to-what-is-deployed.patch
M debian/patches/series
16 files changed, 91 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/57/403157/1

diff --git a/debian/changelog b/debian/changelog
index 8b0545b..a2f8bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+zuul (2.5.0-8-gcbc7f62-wmf5jessie1) jessie-wikimedia; urgency=medium
+
+  * debian/source/options ignore a few more files
+  * WebOb / Paramkiko on Jessie do match upstream requirements.txt, drop the
+related patch that removed the lower bound.
+  * Use python-prettytable Debian package
+
+ -- Antoine Musso   Tue, 09 Jan 2018 14:49:56 +0100
+
 zuul (2.5.0-8-gcbc7f62-wmf4jessie1) jessie-wikimedia; urgency=medium
 
   * sync with precise-wikimedia:
diff --git a/debian/control b/debian/control
index cd9e353..bacf11c 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@
  python-voluptuous (>= 0.7),
 #python-gear (>= 0.5.4),
 #python-apscheduler (>= 2.1.1),
-#python-prettytable (>= 0.6),
+ python-prettytable (>= 0.6),
  python-tz,
  python-babel (>= 1.0),
  python-six (>= 1.6.0),
@@ -87,7 +87,7 @@
  python-voluptuous (>= 0.7),
 #python-gear (>= 0.5.4),
 # python-apscheduler (>= 2.1.1),
-# python-prettytable (>= 0.6),
+ python-prettytable (>= 0.6),
  python-six (>= 1.6.0),
  python-tz,
  python-babel (>= 1.0),
diff --git a/debian/patches/0007-WMF-drop-requirement-ordereddict.patch 
b/debian/patches/0005-WMF-drop-requirement-ordereddict.patch
similarity index 87%
rename from debian/patches/0007-WMF-drop-requirement-ordereddict.patch
rename to debian/patches/0005-WMF-drop-requirement-ordereddict.patch
index 93f7b93..8c6cc1a 100644
--- a/debian/patches/0007-WMF-drop-requirement-ordereddict.patch
+++ b/debian/patches/0005-WMF-drop-requirement-ordereddict.patch
@@ -10,12 +10,12 @@
  1 file changed, 1 deletion(-)
 
 diff --git a/requirements.txt b/requirements.txt
-index e06feb5..69484c7 100644
+index 77ac0a5..793773e 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -5,7 +5,6 @@ Paste
- WebOb
- paramiko
+ WebOb>=1.2.3
+ paramiko>=1.8.0,<2.0.0
  GitPython>=0.3.3
 -ordereddict
  python-daemon>=2.0.4,<2.1.0
diff --git a/debian/patches/0005-WMF-soften-paramiko-requirement.patch 
b/debian/patches/0005-WMF-soften-paramiko-requirement.patch
deleted file mode 100644
index aa8dc80..000
--- a/debian/patches/0005-WMF-soften-paramiko-requirement.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Antoine Musso 
-Date: Fri, 22 Jul 2016 15:15:54 +0200
-Subject: WMF: soften paramiko requirement
-
-1.7 on Precise is good enough for us.
-
-Change-Id: I561e5ed2ff459af02910ef4bb1d803976970a48b

- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 77ac0a5..2fe384b 100644
 a/requirements.txt
-+++ b/requirements.txt
-@@ -3,7 +3,7 @@ pbr>=1.1.0
- PyYAML>=3.1.0
- Paste
- WebOb>=1.2.3
--paramiko>=1.8.0,<2.0.0
-+paramiko
- GitPython>=0.3.3
- ordereddict
- python-daemon>=2.0.4,<2.1.0
diff --git 
a/debian/patches/0008-Do-not-import-paramiko-before-daemonization.patch 
b/debian/patches/0006-Do-not-import-paramiko-before-daemonization.patch
similarity index 100%
rename from 
debian/patches/0008-Do-not-import-paramiko-before-daemonization.patch
rename to debian/patches/0006-Do-not-import-paramiko-before-daemonization.patch
diff --git a/debian/patches/0006-WMF-soften-WebOb-requirement.patch 
b/debian/patches/0006-WMF-soften-WebOb-requirement.patch
deleted file mode 100644
index 6f97948..000
--- a/debian/patches/0006-WMF-soften-WebOb-requirement.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Antoine Musso 
-Date: Fri, 22 Jul 2016 15:16:35 +0200
-Subject: WMF: soften WebOb requirement
-
-Precise 

[MediaWiki-commits] [Gerrit] integration/zuul[patch-queue/debian/jessie-wikimedia]: WMF: pin requirements to what is deployed

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403153 )

Change subject: WMF: pin requirements to what is deployed
..


WMF: pin requirements to what is deployed

Based on what has been previously grabbed via dh_virtualenv and is known
to work on production.

python-prettytable 0.7.2 is available in Jessie so we should use it.

Bug: T158243
Change-Id: I7446aa6441ed975c8ec1f35ba70085a1bb598bf9
---
M requirements.txt
1 file changed, 9 insertions(+), 4 deletions(-)



diff --git a/requirements.txt b/requirements.txt
index ced583d..553b272 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,13 +4,18 @@
 Paste
 WebOb>=1.2.3
 paramiko>=1.8.0,<2.0.0
-GitPython>=0.3.3
+GitPython==2.0.8
+smmap==0.9.0
+gitdb==0.6.4
 python-daemon>=2.0.4,<2.1.0
+lockfile==0.12.2
 extras
-statsd>=1.0.0,<3.0
+statsd==2.1.2
 voluptuous>=0.7,<0.10
-gear>=0.5.7,<1.0.0
-apscheduler>=3.0,<3.1.0
+futures==3.0.5
+gear==0.7.0
+apscheduler==3.0.6
 PrettyTable>=0.6,<0.8
 babel>=1.0
 six>=1.6.0
+tzlocal==1.2.2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7446aa6441ed975c8ec1f35ba70085a1bb598bf9
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: patch-queue/debian/jessie-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/zuul[patch-queue/debian/jessie-wikimedia]: WMF: pin requirements to what is deployed

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403153 )

Change subject: WMF: pin requirements to what is deployed
..

WMF: pin requirements to what is deployed

Based on what has been previously grabbed via dh_virtualenv and is known
to work on production.

python-prettytable 0.7.2 is available in Jessie so we should use it.

Bug: T158243
Change-Id: I7446aa6441ed975c8ec1f35ba70085a1bb598bf9
---
M requirements.txt
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/53/403153/1

diff --git a/requirements.txt b/requirements.txt
index ced583d..553b272 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,13 +4,18 @@
 Paste
 WebOb>=1.2.3
 paramiko>=1.8.0,<2.0.0
-GitPython>=0.3.3
+GitPython==2.0.8
+smmap==0.9.0
+gitdb==0.6.4
 python-daemon>=2.0.4,<2.1.0
+lockfile==0.12.2
 extras
-statsd>=1.0.0,<3.0
+statsd==2.1.2
 voluptuous>=0.7,<0.10
-gear>=0.5.7,<1.0.0
-apscheduler>=3.0,<3.1.0
+futures==3.0.5
+gear==0.7.0
+apscheduler==3.0.6
 PrettyTable>=0.6,<0.8
 babel>=1.0
 six>=1.6.0
+tzlocal==1.2.2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7446aa6441ed975c8ec1f35ba70085a1bb598bf9
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: patch-queue/debian/jessie-wikimedia
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403130 )

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/node-tunnel-agent 
refs/changes/30/403130/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/403130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[master]: Package 0.4.3

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403127 )

Change subject: Package 0.4.3
..


Package 0.4.3

Catch up with some NodeJS API change
Support http and https proxies properly

Bug: T183569
Change-Id: I54d3d32c07ae275524adeb4a0688c86541439384
---
M debian/changelog
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 1ed95ac..f4801cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+node-tunnel-agent (0.4.3-1) UNRELEASED; urgency=medium
+
+  * gbp basic configuration
+  * New upstream version 0.4.3
+  * Fix https://phabricator.wikimedia.org/T183569
+  * Closes: #801897
+
+ -- Antoine Musso   Tue, 09 Jan 2018 11:35:49 +0100
+
 node-tunnel-agent (0.3.1-1) unstable; urgency=low
 
   * Initial release (Closes: #719716)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54d3d32c07ae275524adeb4a0688c86541439384
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[master]: Merge tag 'upstream/0.4.3'

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403126 )

Change subject: Merge tag 'upstream/0.4.3'
..


Merge tag 'upstream/0.4.3'

Upstream version 0.4.3

Bug: T183569
Change-Id: I21ca800b13a18f29938e3c7d36b1227d91ffd8bd
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21ca800b13a18f29938e3c7d36b1227d91ffd8bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[pristine-tar]: pristine-tar data for node-tunnel-agent_0.4.3.orig.tar.gz

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403125 )

Change subject: pristine-tar data for node-tunnel-agent_0.4.3.orig.tar.gz
..


pristine-tar data for node-tunnel-agent_0.4.3.orig.tar.gz

Bug: T183569
Change-Id: Id31dd9a6d79baca945f4f4825597e6eae2348778
---
A node-tunnel-agent_0.4.3.orig.tar.gz.delta
A node-tunnel-agent_0.4.3.orig.tar.gz.id
2 files changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/node-tunnel-agent_0.4.3.orig.tar.gz.delta 
b/node-tunnel-agent_0.4.3.orig.tar.gz.delta
new file mode 100644
index 000..ff10f97
--- /dev/null
+++ b/node-tunnel-agent_0.4.3.orig.tar.gz.delta
Binary files differ
diff --git a/node-tunnel-agent_0.4.3.orig.tar.gz.id 
b/node-tunnel-agent_0.4.3.orig.tar.gz.id
new file mode 100644
index 000..ee8f223
--- /dev/null
+++ b/node-tunnel-agent_0.4.3.orig.tar.gz.id
@@ -0,0 +1 @@
+aa9cdbca5de87957c0f73ecafa52bf3a1d1c3bd7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id31dd9a6d79baca945f4f4825597e6eae2348778
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: pristine-tar
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[upstream]: New upstream version 0.4.3

[Hashar (Code Review)]

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403124 )

Change subject: New upstream version 0.4.3
..


New upstream version 0.4.3

Bug: T183569
Change-Id: If0cdac58fc122d37786f187d506f45e9d149ad6c
---
A .jshintrc
M index.js
M package.json
3 files changed, 35 insertions(+), 10 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..4c1c8d4
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,5 @@
+{
+  "node": true,
+  "asi": true,
+  "laxcomma": true
+}
diff --git a/index.js b/index.js
index 3f7bbb9..68013ac 100644
--- a/index.js
+++ b/index.js
@@ -25,6 +25,7 @@
   var agent = new TunnelingAgent(options)
   agent.request = http.request
   agent.createSocket = createSecureSocket
+  agent.defaultPort = 443
   return agent
 }
 
@@ -38,6 +39,7 @@
   var agent = new TunnelingAgent(options)
   agent.request = https.request
   agent.createSocket = createSecureSocket
+  agent.defaultPort = 443
   return agent
 }
 
@@ -67,28 +69,43 @@
 }
 util.inherits(TunnelingAgent, events.EventEmitter)
 
-TunnelingAgent.prototype.addRequest = function addRequest(req, host, port) {
+TunnelingAgent.prototype.addRequest = function addRequest(req, options) {
   var self = this
+
+   // Legacy API: addRequest(req, host, port, path)
+  if (typeof options === 'string') {
+options = {
+  host: options,
+  port: arguments[2],
+  path: arguments[3]
+};
+  }
 
   if (self.sockets.length >= this.maxSockets) {
 // We are over limit so we'll add it to the queue.
-self.requests.push({host: host, port: port, request: req})
+self.requests.push({host: options.host, port: options.port, request: req})
 return
   }
 
   // If we are under maxSockets create a new one.
-  self.createSocket({host: host, port: port, request: req}, function(socket) {
+  self.createConnection({host: options.host, port: options.port, request: req})
+}
+
+TunnelingAgent.prototype.createConnection = function createConnection(pending) 
{
+  var self = this
+
+  self.createSocket(pending, function(socket) {
 socket.on('free', onFree)
 socket.on('close', onCloseOrRemove)
 socket.on('agentRemove', onCloseOrRemove)
-req.onSocket(socket)
+pending.request.onSocket(socket)
 
 function onFree() {
-  self.emit('free', socket, host, port)
+  self.emit('free', socket, pending.host, pending.port)
 }
 
 function onCloseOrRemove(err) {
-  self.removeSocket()
+  self.removeSocket(socket)
   socket.removeListener('free', onFree)
   socket.removeListener('close', onCloseOrRemove)
   socket.removeListener('agentRemove', onCloseOrRemove)
@@ -173,9 +190,7 @@
   if (pending) {
 // If we have pending requests and a socket gets closed a new one
 // needs to be created to take over in the pool for the one that closed.
-this.createSocket(pending, function(socket) {
-  pending.request.onSocket(socket)
-})
+this.createConnection(pending)
   }
 }
 
@@ -188,6 +203,7 @@
   , socket: socket
   }
 ))
+self.sockets[self.sockets.indexOf(socket)] = secureSocket
 cb(secureSocket)
   })
 }
diff --git a/package.json b/package.json
index 1774f25..a503283 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,16 @@
 {
   "author": "Mikeal Rogers  
(http://www.futurealoof.com)",
   "name": "tunnel-agent",
+  "license": "Apache-2.0",
   "description": "HTTP proxy tunneling agent. Formerly part of mikeal/request, 
now a standalone module.",
-  "version": "0.3.1",
+  "version": "0.4.3",
   "repository": {
 "url": "https://github.com/mikeal/tunnel-agent;
   },
   "main": "index.js",
+  "files": [
+"index.js"
+  ],
   "dependencies": {},
   "devDependencies": {},
   "optionalDependencies": {},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0cdac58fc122d37786f187d506f45e9d149ad6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: upstream
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[master]: Package 0.4.3

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403127 )

Change subject: Package 0.4.3
..

Package 0.4.3

Catch up with some NodeJS API change
Support http and https proxies properly

Bug: T183569
Change-Id: I54d3d32c07ae275524adeb4a0688c86541439384
---
M debian/changelog
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/node-tunnel-agent 
refs/changes/27/403127/1

diff --git a/debian/changelog b/debian/changelog
index 1ed95ac..f4801cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+node-tunnel-agent (0.4.3-1) UNRELEASED; urgency=medium
+
+  * gbp basic configuration
+  * New upstream version 0.4.3
+  * Fix https://phabricator.wikimedia.org/T183569
+  * Closes: #801897
+
+ -- Antoine Musso   Tue, 09 Jan 2018 11:35:49 +0100
+
 node-tunnel-agent (0.3.1-1) unstable; urgency=low
 
   * Initial release (Closes: #719716)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54d3d32c07ae275524adeb4a0688c86541439384
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[master]: Merge tag 'upstream/0.4.3'

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403126 )

Change subject: Merge tag 'upstream/0.4.3'
..

Merge tag 'upstream/0.4.3'

Upstream version 0.4.3

Bug: T183569
Change-Id: I21ca800b13a18f29938e3c7d36b1227d91ffd8bd
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/node-tunnel-agent 
refs/changes/26/403126/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21ca800b13a18f29938e3c7d36b1227d91ffd8bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[pristine-tar]: pristine-tar data for node-tunnel-agent_0.4.3.orig.tar.gz

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403125 )

Change subject: pristine-tar data for node-tunnel-agent_0.4.3.orig.tar.gz
..

pristine-tar data for node-tunnel-agent_0.4.3.orig.tar.gz

Bug: T183569
Change-Id: Id31dd9a6d79baca945f4f4825597e6eae2348778
---
A node-tunnel-agent_0.4.3.orig.tar.gz.delta
A node-tunnel-agent_0.4.3.orig.tar.gz.id
2 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/node-tunnel-agent 
refs/changes/25/403125/1

diff --git a/node-tunnel-agent_0.4.3.orig.tar.gz.delta 
b/node-tunnel-agent_0.4.3.orig.tar.gz.delta
new file mode 100644
index 000..ff10f97
--- /dev/null
+++ b/node-tunnel-agent_0.4.3.orig.tar.gz.delta
Binary files differ
diff --git a/node-tunnel-agent_0.4.3.orig.tar.gz.id 
b/node-tunnel-agent_0.4.3.orig.tar.gz.id
new file mode 100644
index 000..ee8f223
--- /dev/null
+++ b/node-tunnel-agent_0.4.3.orig.tar.gz.id
@@ -0,0 +1 @@
+aa9cdbca5de87957c0f73ecafa52bf3a1d1c3bd7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id31dd9a6d79baca945f4f4825597e6eae2348778
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: pristine-tar
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...node-tunnel-agent[upstream]: New upstream version 0.4.3

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403124 )

Change subject: New upstream version 0.4.3
..

New upstream version 0.4.3

Bug: T183569
Change-Id: If0cdac58fc122d37786f187d506f45e9d149ad6c
---
A .jshintrc
M index.js
M package.json
3 files changed, 35 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/node-tunnel-agent 
refs/changes/24/403124/1

diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..4c1c8d4
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,5 @@
+{
+  "node": true,
+  "asi": true,
+  "laxcomma": true
+}
diff --git a/index.js b/index.js
index 3f7bbb9..68013ac 100644
--- a/index.js
+++ b/index.js
@@ -25,6 +25,7 @@
   var agent = new TunnelingAgent(options)
   agent.request = http.request
   agent.createSocket = createSecureSocket
+  agent.defaultPort = 443
   return agent
 }
 
@@ -38,6 +39,7 @@
   var agent = new TunnelingAgent(options)
   agent.request = https.request
   agent.createSocket = createSecureSocket
+  agent.defaultPort = 443
   return agent
 }
 
@@ -67,28 +69,43 @@
 }
 util.inherits(TunnelingAgent, events.EventEmitter)
 
-TunnelingAgent.prototype.addRequest = function addRequest(req, host, port) {
+TunnelingAgent.prototype.addRequest = function addRequest(req, options) {
   var self = this
+
+   // Legacy API: addRequest(req, host, port, path)
+  if (typeof options === 'string') {
+options = {
+  host: options,
+  port: arguments[2],
+  path: arguments[3]
+};
+  }
 
   if (self.sockets.length >= this.maxSockets) {
 // We are over limit so we'll add it to the queue.
-self.requests.push({host: host, port: port, request: req})
+self.requests.push({host: options.host, port: options.port, request: req})
 return
   }
 
   // If we are under maxSockets create a new one.
-  self.createSocket({host: host, port: port, request: req}, function(socket) {
+  self.createConnection({host: options.host, port: options.port, request: req})
+}
+
+TunnelingAgent.prototype.createConnection = function createConnection(pending) 
{
+  var self = this
+
+  self.createSocket(pending, function(socket) {
 socket.on('free', onFree)
 socket.on('close', onCloseOrRemove)
 socket.on('agentRemove', onCloseOrRemove)
-req.onSocket(socket)
+pending.request.onSocket(socket)
 
 function onFree() {
-  self.emit('free', socket, host, port)
+  self.emit('free', socket, pending.host, pending.port)
 }
 
 function onCloseOrRemove(err) {
-  self.removeSocket()
+  self.removeSocket(socket)
   socket.removeListener('free', onFree)
   socket.removeListener('close', onCloseOrRemove)
   socket.removeListener('agentRemove', onCloseOrRemove)
@@ -173,9 +190,7 @@
   if (pending) {
 // If we have pending requests and a socket gets closed a new one
 // needs to be created to take over in the pool for the one that closed.
-this.createSocket(pending, function(socket) {
-  pending.request.onSocket(socket)
-})
+this.createConnection(pending)
   }
 }
 
@@ -188,6 +203,7 @@
   , socket: socket
   }
 ))
+self.sockets[self.sockets.indexOf(socket)] = secureSocket
 cb(secureSocket)
   })
 }
diff --git a/package.json b/package.json
index 1774f25..a503283 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,16 @@
 {
   "author": "Mikeal Rogers  
(http://www.futurealoof.com)",
   "name": "tunnel-agent",
+  "license": "Apache-2.0",
   "description": "HTTP proxy tunneling agent. Formerly part of mikeal/request, 
now a standalone module.",
-  "version": "0.3.1",
+  "version": "0.4.3",
   "repository": {
 "url": "https://github.com/mikeal/tunnel-agent;
   },
   "main": "index.js",
+  "files": [
+"index.js"
+  ],
   "dependencies": {},
   "devDependencies": {},
   "optionalDependencies": {},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0cdac58fc122d37786f187d506f45e9d149ad6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/node-tunnel-agent
Gerrit-Branch: upstream
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker image for commited node_modules

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402876 )

Change subject: docker image for commited node_modules
..

docker image for commited node_modules

The mediawiki/services/*/deploy repositories have node_modules commited
in. Port the logic from JJB (npm-oid, npm-oid-setenv) to a Docker image.

The idea is to reuse the commited node_modules and "manually" add each
of the devDependencies to it.

Change-Id: I4b16fe1b16208075fd96381279f0a678dd8db204
---
A dockerfiles/npm-test-deploy/.dockerignore
A dockerfiles/npm-test-deploy/.gitignore
A dockerfiles/npm-test-deploy/Dockerfile
A dockerfiles/npm-test-deploy/example-run.sh
A dockerfiles/npm-test-deploy/run-for-deploy.sh
M jjb/job-templates.yaml
6 files changed, 82 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/402876/1

diff --git a/dockerfiles/npm-test-deploy/.dockerignore 
b/dockerfiles/npm-test-deploy/.dockerignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-deploy/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-deploy/.gitignore 
b/dockerfiles/npm-test-deploy/.gitignore
new file mode 100644
index 000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-deploy/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-deploy/Dockerfile 
b/dockerfiles/npm-test-deploy/Dockerfile
new file mode 100644
index 000..55650e8
--- /dev/null
+++ b/dockerfiles/npm-test-deploy/Dockerfile
@@ -0,0 +1,10 @@
+FROM wmfreleng/npm-test-stretch:latest
+
+USER root
+RUN git clone --depth 1 https://gerrit.wikimedia.org/r/integration/jenkins 
/tmp/jenkins \
+&& cp /tmp/jenkins/bin/npm-install-dev.py /npm-install-dev.py \
+&& rm -rf /tmp/jenkins
+
+USER nobody
+COPY run-for-deploy.sh /run-for-deploy.sh
+ENTRYPOINT ["/run-for-deploy.sh"]
diff --git a/dockerfiles/npm-test-deploy/example-run.sh 
b/dockerfiles/npm-test-deploy/example-run.sh
new file mode 100644
index 000..8082d0b
--- /dev/null
+++ b/dockerfiles/npm-test-deploy/example-run.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -eux
+
+mkdir -m 777 -p log
+mkdir -m 777 -p src
+mkdir -m 777 -p cache
+
+docker run \
+--rm --tty \
+--volume /"$(pwd)"/src://src \
+-e ZUUL_URL=https://gerrit.wikimedia.org/r/ \
+-e ZUUL_PROJECT=mediawiki/services/cxserver/deploy \
+-e ZUUL_REF="master" \
+wmfreleng/ci-src-setup-simple
+
+docker run \
+--rm --tty \
+--volume /"$(pwd)"/log://var/lib/jenkins/log \
+--volume /"$(pwd)"/cache://cache \
+--volume /"$(pwd)"/src://src \
+ wmfreleng/npm-test-deploy:latest
diff --git a/dockerfiles/npm-test-deploy/run-for-deploy.sh 
b/dockerfiles/npm-test-deploy/run-for-deploy.sh
new file mode 100755
index 000..2e23930
--- /dev/null
+++ b/dockerfiles/npm-test-deploy/run-for-deploy.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+umask 0002
+
+node --version
+npm --version
+
+# All modules should already be in the deploy repo, no npm install we just
+# install the development dependencies.
+export NODE_PATH=/src/node_modules
+export PATH="$PATH:/src/node_modules/.bin"
+
+rm -f /src/src/node_modules
+cd /src
+/npm-install-dev.py
+
+# grunt.loadNpmTasks() does not honor NODE_PATH so fake it
+# https://github.com/gruntjs/grunt-cli/pull/18
+# https://phabricator.wikimedia.org/T92369
+ln -fs /src/node_modules /src/src/node_modules
+
+cd /src/src
+exec npm run-script "${@:-test}"
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 8cbbf03..dd4e4cc 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -283,6 +283,25 @@
  - castor-save
 
 - job-template:
+name: '{name}-deploy-npm-node-6-docker'
+node: DebianJessieDocker
+concurrent: true
+docker_image_var: 'wmfreleng/npm-test-deploy:v000'
+triggers:
+- zuul
+builders:
+- docker-castor-load
+- docker-src-dir
+- docker-log-dir
+- docker-ci-src-setup-simple
+- docker-run-with-log-cache-src:
+   image: '{obj:docker_image_var}'
+   logdir: '/log'
+publishers:
+- archive-log-allow-empty
+- castor-save-workspace-cache
+
+- job-template:
 name: '{phpflavor}lint'
 node: contintLabsSlave && DebianJessie
 defaults: use-remote-zuul-shallow-clone

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b16fe1b16208075fd96381279f0a678dd8db204
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: reenable overlay/overlayfs kernel modules

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402797 )

Change subject: contint: reenable overlay/overlayfs kernel modules
..

contint: reenable overlay/overlayfs kernel modules

They are required by Docker. da1bbb751 had the side effect of
blacklisting the overlay and overlayfs kernel modules which in turns
prevents Docker from starting. On contint1001 / contint2001:

  'overlay' not found as a supported filesystem on this host.
  Please ensure kernel is new enough and has overlay support loaded.

The mystery is that they were supposedly blacklisted in
/etc/modprobe.d/blacklist-wmf.conf:

 blacklist overlay
 install overlay /bin/true
 blacklist overlayfs
 install overlayfs /bin/true

Though that cleared DID NOT work until da1bbb751 got applied.

Apply "profile::base::overlayfs: true" to contint1001/contint2001 to
enable the overlay and overlayfs kernel modules.

See T184018 for Toolforge

Bug: T184410
Change-Id: I9cdfe777c7139ce376fc35c54e75f5f8f1efaa33
---
M hieradata/hosts/contint1001.yaml
M hieradata/hosts/contint2001.yaml
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/402797/1

diff --git a/hieradata/hosts/contint1001.yaml b/hieradata/hosts/contint1001.yaml
index a2b4209..181b4b6 100644
--- a/hieradata/hosts/contint1001.yaml
+++ b/hieradata/hosts/contint1001.yaml
@@ -4,3 +4,6 @@
 profile::ci::jenkins::service_monitor: true
 profile::zuul::server::service_ensure: running
 profile::zuul::server::service_enable: true
+
+# Docker requires the overlay / overlayFS kernel module
+profile::base::overlayfs: true
diff --git a/hieradata/hosts/contint2001.yaml b/hieradata/hosts/contint2001.yaml
index 05d3227..fe45664 100644
--- a/hieradata/hosts/contint2001.yaml
+++ b/hieradata/hosts/contint2001.yaml
@@ -4,3 +4,6 @@
 profile::ci::jenkins::service_monitor: false
 profile::zuul::server::service_ensure: stopped
 profile::zuul::server::service_enable: false
+
+# Docker requires the overlay / overlayFS kernel module
+profile::base::overlayfs: true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cdfe777c7139ce376fc35c54e75f5f8f1efaa33
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Do fork cucumber and fix puppet-lint

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401561 )

Change subject: Do fork cucumber and fix puppet-lint
..

Do fork cucumber and fix puppet-lint

808c61ec09 made cucumber to no more fork:
"Run cucumber inline with rake process. Fixes a working directory
related error in local testing environment."

The trouble is that cucumber exit(0) on success which terminates the
rake process and prevents running other tasks (such as puppet-lint).

Make cucumber fork again so that other tasks have a chance to run.

Pass puppet-lint again by:
* excluding the 140 chars check, would have to be fixed later on
* ignore a couple issues in upsteam modules (stdlib and systemd)

Bug: T181354
Change-Id: I736cf5dacc84a7b6c7ec44c7b1940d723376d088
---
M .puppet-lint.rc
M Rakefile
M puppet/modules/role/manifests/ores.pp
M puppet/modules/stdlib/tests/file_line.pp
M puppet/modules/systemd/manifests/service.pp
M puppet/modules/thumbor/manifests/init.pp
6 files changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/61/401561/1

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index d6db438..c18b69f 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -4,5 +4,7 @@
 # that this is not abused.
 --no-80chars-check
 
+--no-140chars-check
+
 # Be strict.
 --fail-on-warnings
diff --git a/Rakefile b/Rakefile
index b057e5a..64dc301 100644
--- a/Rakefile
+++ b/Rakefile
@@ -34,7 +34,6 @@
 end
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.cucumber_opts = '-r tests/features tests/features'
-  t.fork = false
 end
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '-I tests/spec --default-path tests'
diff --git a/puppet/modules/role/manifests/ores.pp 
b/puppet/modules/role/manifests/ores.pp
index 8651e0e..338a8a2 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -35,6 +35,5 @@
 # when ORES is installed locally via role::ores_service.
 # This is pretty horrible but seems to be the only way of avoiding cycles.
 Systemd::Service<| title == 'ores-wsgi' or title == 'ores-celery' |>
-->
-Mediawiki::Maintenance['check ORES model versions']
+-> Mediawiki::Maintenance['check ORES model versions']
 }
diff --git a/puppet/modules/stdlib/tests/file_line.pp 
b/puppet/modules/stdlib/tests/file_line.pp
index eea693e..64f5b2b 100644
--- a/puppet/modules/stdlib/tests/file_line.pp
+++ b/puppet/modules/stdlib/tests/file_line.pp
@@ -1,5 +1,6 @@
 # This is a simple smoke test
 # of the file_line resource type.
+# lint:ignore:arrow_on_right_operand_line
 file { '/tmp/dansfile':
   ensure => present
 }->
@@ -7,3 +8,4 @@
   line => 'dan is awesome',
   path => '/tmp/dansfile',
 }
+# lint:endignore
diff --git a/puppet/modules/systemd/manifests/service.pp 
b/puppet/modules/systemd/manifests/service.pp
index cda8297..d4e6486 100644
--- a/puppet/modules/systemd/manifests/service.pp
+++ b/puppet/modules/systemd/manifests/service.pp
@@ -71,10 +71,12 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
+# lint:ignore:selector_inside_resource
 content => $epp_template ? {
 true=> epp($unit_template, $template_variables),
 default => template($unit_template),
 },
+# lint:endignore
 }
 
 exec { "systemd reload for ${name}":
diff --git a/puppet/modules/thumbor/manifests/init.pp 
b/puppet/modules/thumbor/manifests/init.pp
index 16d84a2..6edac72 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -37,8 +37,8 @@
 }
 
 package { 'python-thumbor-wikimedia':
-ensure  => 'present',
-notify  => Exec['stop-and-disable-default-thumbor-service'],
+ensure => 'present',
+notify => Exec['stop-and-disable-default-thumbor-service'],
 }
 
 exec { 'stop-and-disable-default-thumbor-service':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I736cf5dacc84a7b6c7ec44c7b1940d723376d088
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Compile puppet catalogs in CI

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401545 )

Change subject: Compile puppet catalogs in CI
..

Compile puppet catalogs in CI

Add rspec-puppet tasks at the root of the repository so one can easily
compile the catalogues.
First for a dummy host that has no role applied, and if successful for
each roles. That is done serially which is quite slow.

Bug: T183570
Change-Id: I4ca7a2b80d7b0ffb8b3fcef40c498b8c5dfc1ba0
X-Notable-Event: Happy-New-Gregorian-Year
---
M Rakefile
M puppet/spec/spec_helper.rb
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/45/401545/1

diff --git a/Rakefile b/Rakefile
index b057e5a..93a0b4a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,12 +39,25 @@
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '-I tests/spec --default-path tests'
 end
+
+desc 'Compile default host Puppet catalog'
+RSpec::Core::RakeTask.new(:compile_host) do |t|
+  t.rspec_opts = '--format doc -I puppet/spec --default-path puppet --pattern 
spec/hosts/\*_spec.rb'
+end
+desc 'Compile Puppet roles'
+RSpec::Core::RakeTask.new(:compile_roles) do |t|
+  t.rspec_opts = '-I puppet/spec --default-path puppet --exclude-pattern 
spec/hosts/\*_spec.rb'
+end
+# Compile host first since it is fairly fast
+desc 'Compile puppet catalogs'
+task compile: [:compile_host, :compile_roles]
+
 RuboCop::RakeTask.new(:rubocop)
 
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
-task test: [:clean, :syntax, :spec, :rubocop, :cucumber, :lint, :doc]
+task test: [:clean, :syntax, :spec, :rubocop, :cucumber, :lint, :doc, :compile]
 
 desc 'Generate all documentations'
 task :doc do
diff --git a/puppet/spec/spec_helper.rb b/puppet/spec/spec_helper.rb
index ee86e07..a6e487d 100644
--- a/puppet/spec/spec_helper.rb
+++ b/puppet/spec/spec_helper.rb
@@ -1,4 +1,5 @@
 require 'rspec-puppet'
+require 'fileutils'
 
 def puppet_path
   File.expand_path(File.join(__FILE__, '../..'))
@@ -14,6 +15,7 @@
   conf = File.read(File.join(puppet_path, 'hiera.yaml'))
   conf.gsub!(%r{/vagrant/puppet}, puppet_path)
 
+  FileUtils.mkdir_p(fixture_path)
   fixture = File.join(fixture_path, 'hiera.yaml')
   File.write(fixture, conf)
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ca7a2b80d7b0ffb8b3fcef40c498b8c5dfc1ba0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Override npm run-script by passing an argument

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401532 )

Change subject: Override npm run-script by passing an argument
..

Override npm run-script by passing an argument

Stop using an environment variable (NPM_RUN_SCRIPT) to override the npm
script to run. It is easier to just pass the script we want on the
command line.

wmfreleng/npm-test default to 'npm run-script test'
Remove NPM_RUN_SCRIPT added in e005df329

Change-Id: I2fe7a15fc35c9a68c23cb6278199073ac9ac49e2
---
M dockerfiles/npm-test/example-run.sh
M dockerfiles/npm-test/run.sh
M jjb/job-templates.yaml
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/401532/1

diff --git a/dockerfiles/npm-test/example-run.sh 
b/dockerfiles/npm-test/example-run.sh
index 21a8ce7..98ff073 100644
--- a/dockerfiles/npm-test/example-run.sh
+++ b/dockerfiles/npm-test/example-run.sh
@@ -12,14 +12,14 @@
  git checkout FETCH_HEAD
 )
 
-# NPM_RUN_SCRIPT=doc => npm run-script doc
+# Arguments are passed to 'npm run-script',eg 'doc'
 docker run \
 --rm --tty \
--e NPM_RUN_SCRIPT=doc \
 --volume /"$(pwd)"/log://var/lib/jenkins/log \
 --volume /"$(pwd)"/cache://cache \
 --volume /"$(pwd)"/src://src \
- wmfreleng/npm-test:latest
+ wmfreleng/npm-test:latest \
+doc
 
 if grep -q JSDuck src/docs/index.html; then
 echo "JSDuck documentation has been generated"
diff --git a/dockerfiles/npm-test/run.sh b/dockerfiles/npm-test/run.sh
index 4926b7a..713dbde 100755
--- a/dockerfiles/npm-test/run.sh
+++ b/dockerfiles/npm-test/run.sh
@@ -10,4 +10,4 @@
 npm --version
 rm -rf node_modules
 npm install --no-progress
-npm run-script "${NPM_RUN_SCRIPT:-test}"
+npm run-script "${@:-test}"
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index a3f20ff..48d2e73 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -167,7 +167,7 @@
 name: 'npm-node-6-docker'
 node: DebianJessieDocker
 concurrent: true
-docker_image_var: 'wmfreleng/npm-test:v2017.12.11.16.37'
+docker_image_var: 'wmfreleng/npm-test:v2018.01.02.16.08'
 triggers:
  - zuul
 builders:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fe7a15fc35c9a68c23cb6278199073ac9ac49e2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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