Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270686
Change subject: Create generic 'mwext-jsduck-publish' job and use it
......................................................................
Create generic 'mwext-jsduck-publish' job and use it
Bug: T125473
Change-Id: I9b8359558539950e8d60fe073049fc968de3b2de
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 10 insertions(+), 95 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/86/270686/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index bc456f4..ec538fc 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -304,9 +304,9 @@
- php55
- job:
- name: 'mwext-Flow-jsduck-publish'
+ name: 'mwext-jsduck-publish'
node: contintLabsSlave && UbuntuTrusty
- defaults: use-remoteonly-zuul
+ defaults: use-remote-zuul-shallow-clone
concurrent: false
triggers:
- zuul
@@ -314,20 +314,7 @@
- jsduck
- doc-publish:
docsrc: 'docs'
- docdest: 'Flow/$ZUUL_BRANCH/js'
-
-- job-template:
- name: 'mwext-GuidedTour-jsduck-publish'
- node: contintLabsSlave && UbuntuTrusty
- defaults: use-remoteonly-zuul
- concurrent: false
- triggers:
- - zuul
- builders:
- - jsduck
- - doc-publish:
- docsrc: 'docs'
- docdest: 'GuidedTour/$ZUUL_BRANCH/js'
+ docdest: '$DOC_BASENAME/$ZUUL_BRANCH/js'
- job-template:
name: 'mwext-PoolCounter-build'
@@ -339,32 +326,6 @@
- shell: |
cd daemon
make
-
-- job-template:
- name: 'mwext-MultimediaViewer-jsduck-publish'
- node: contintLabsSlave && UbuntuTrusty
- defaults: use-remoteonly-zuul
- concurrent: false
- triggers:
- - zuul
- builders:
- - jsduck
- - doc-publish:
- docsrc: 'docs'
- docdest: 'MultimediaViewer/$ZUUL_BRANCH/js'
-
-- job-template:
- name: 'mwext-TemplateData-jsduck-publish'
- node: contintLabsSlave && UbuntuTrusty
- defaults: use-remoteonly-zuul
- concurrent: false
- triggers:
- - zuul
- builders:
- - jsduck
- - doc-publish:
- docsrc: 'docs'
- docdest: 'TemplateData/$ZUUL_BRANCH/js'
- job:
name: 'mwext-VisualEditor-publish'
@@ -381,35 +342,6 @@
docdest: 'VisualEditor/$ZUUL_BRANCH'
publishers:
- global-teardown
-
-- job:
- name: 'mwext-MobileFrontend-publish'
- node: contintLabsSlave && UbuntuTrusty
- defaults: use-remoteonly-zuul
- concurrent: false
- triggers:
- - zuul
- builders:
- - npm-install
- - npm-run-doc
- - doc-publish:
- docsrc: 'docs'
- docdest: 'MobileFrontend/$ZUUL_BRANCH/js'
- publishers:
- - global-teardown
-
-- job:
- name: 'mwext-EventLogging-jsduck-publish'
- node: contintLabsSlave && UbuntuTrusty
- defaults: use-remoteonly-zuul
- concurrent: false
- triggers:
- - zuul
- builders:
- - jsduck
- - doc-publish:
- docsrc: 'docs'
- docdest: 'EventLogging/$ZUUL_BRANCH/js'
- job:
name: 'mwext-MobileFrontend-doxygen-publish'
@@ -488,14 +420,6 @@
- '{name}-{ext-name}-npm':
ext-name: VisualEditor
-
- - 'mwext-MobileFrontend-publish'
- - 'mwext-GuidedTour-jsduck-publish'
- - 'mwext-MultimediaViewer-jsduck-publish'
-
- - 'mwext-TemplateData-jsduck-publish':
- ext-name: TemplateData
-
# Deprecated, extensions should be converted
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 214e87d..b2d2f84 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1113,17 +1113,7 @@
- name: 'mwext-CirrusSearch-whitespaces'
branch: ^master$
- - name: 'mwext-EventLogging-jsduck-publish'
- branch: ^master$
- - name: 'mwext-Flow-jsduck-publish'
- branch: ^(REL1_26|master)$
- - name: 'mwext-MobileFrontend-publish'
- branch: ^master$
- - name: 'mwext-GuidedTour-jsduck-publish'
- branch: ^master$
- - name: 'mwext-MultimediaViewer-jsduck-publish'
- branch: ^master$
- - name: 'mwext-TemplateData-jsduck-publish'
+ - name: 'mwext-jsduck-publish'
branch: ^master$
- name: 'mwext-VisualEditor-publish'
branch: ^master$
@@ -3269,7 +3259,7 @@
check:
- jsonlint
postmerge:
- - mwext-EventLogging-jsduck-publish
+ - mwext-jsduck-publish
- name: eventlogging
template:
@@ -3328,7 +3318,7 @@
experimental:
- mwext-mw-selenium
postmerge:
- - mwext-Flow-jsduck-publish
+ - mwext-jsduck-publish
- name: mediawiki/extensions/FormPreloadPostCache
template:
@@ -3551,7 +3541,7 @@
- jsonlint
- jshint
postmerge:
- - mwext-GuidedTour-jsduck-publish
+ - mwext-jsduck-publish
- name: mediawiki/extensions/GWToolset
template:
@@ -3834,7 +3824,7 @@
check:
- jsonlint
postmerge:
- - mwext-MultimediaViewer-jsduck-publish
+ - mwext-jsduck-publish
- name: mediawiki/extensions/MwEmbedSupport
template:
@@ -7001,7 +6991,7 @@
gate-and-submit:
- mediawiki-gate
postmerge:
- - mwext-TemplateData-jsduck-publish
+ - mwext-jsduck-publish
- name: mediawiki/extensions/Thanks
template:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 8430302..6352eac 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -193,3 +193,4 @@
# Normalize the project name by removing /'s
if 'ZUUL_PROJECT' in params:
params['DOC_PROJECT'] = params['ZUUL_PROJECT'].replace('/', '-')
+ params['DOC_BASENAME'] = params['ZUUL_PROJECT'].split('/')[-1]
--
To view, visit https://gerrit.wikimedia.org/r/270686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b8359558539950e8d60fe073049fc968de3b2de
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
