jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/387653 )
Change subject: BABEL_CACHE_PATH in npm image for Popups ...................................................................... BABEL_CACHE_PATH in npm image for Popups And migrate mediawiki/extensions/Popups npm job to Docker. That was previously reverted by 0bf7d9d4f17. Bug: T179425 Change-Id: Id66a5c40fa57afa8ec704ceb07ab138c3ba736f5 --- M dockerfiles/npm/Dockerfile M jjb/job-templates.yaml M zuul/layout.yaml 3 files changed, 3 insertions(+), 7 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile index eaa1750..9b68bd8 100644 --- a/dockerfiles/npm/Dockerfile +++ b/dockerfiles/npm/Dockerfile @@ -21,6 +21,7 @@ # See <https://docs.npmjs.com/misc/config#environment-variables> # and <https://docs.npmjs.com/cli/cache> ENV NPM_CONFIG_CACHE=/cache +ENV BABEL_CACHE_PATH=$XDG_CACHE_HOME/babel-cache.json ENTRYPOINT ["npm"] CMD ["--help"] diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index c3e8d50..d4f7c5b 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -176,7 +176,7 @@ - docker-cache-dir - docker-ci-src-setup-simple - docker-run-with-log-cache-src: - image: 'wmfreleng/npm-test:v2017.11.09.15.15' + image: 'wmfreleng/npm-test:v2017.11.10.22.15' logdir: '/log' publishers: - archive-log-allow-empty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0b077b5..3a29eb4 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6627,16 +6627,11 @@ gate-and-submit-swat: *mediawiki-extensions-poolcounter-gate-and-submit - name: mediawiki/extensions/Popups - # FIXME: Popups runs qunit in "npm test" (T179425), so it - # can't use mwgate-npm docker variant - test: - - mwgate-npm-node-6-jessie - gate-and-submit: - - mwgate-npm-node-6-jessie template: - name: extension-unittests-generic - name: extension-qunit-generic - name: mediawiki-core-qunit-selenium-jessie + - name: mwgate-npm - name: mediawiki/extensions/PostEdit template: -- To view, visit https://gerrit.wikimedia.org/r/387653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id66a5c40fa57afa8ec704ceb07ab138c3ba736f5 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
