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

Change subject: Mw extensions jobs for Nodepool
......................................................................


Mw extensions jobs for Nodepool

Create:
mwext-testextension-hhvm-composer-jessie
mwext-testextension-hhvm-composer-jessie-non-voting
mwext-testextension-hhvm-jessie
mwext-testextension-hhvm-jessie-non-voting
mwext-testextension-php55-composer-trusty
mwext-testextension-php55-composer-trusty-non-voting
mwext-testextension-php55-trusty
mwext-testextension-php55-trusty-non-voting

In Zuul template extension-unittests-non-voting, replace the jobs that
ran on permanent slaves.  Remove some duplicates from experimental
pipeline.

If this passes the test we will clean up the rest and remove duplicates.

We will need to keep some behind for php53 tests since php 5.3 is not in
nodepool.

Bug: T137199
Signed-off-by: Antoine Musso <has...@free.fr>
Change-Id: Ica2be8423fe818564342bcb67204736d7e29f1bc
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 70 insertions(+), 3 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 057a8c7..2cbeaad 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -256,6 +256,33 @@
     triggers:
      - zuul
 
+- job-template: &job_mwext-testextension-image
+    name: 'mwext-testextension-{phpflavor}-{image}'
+    node: ci-{image}-wikimedia
+    concurrent: true
+    triggers:
+     - zuul
+    builders:
+     - castor-load
+     - assert-phpflavor:
+         phpflavor: '{phpflavor}'
+     - hhvm-clear-hhbc
+     - prepare-mediawiki-zuul-project
+     - mw-fetch-composer-dev
+     - mw-run-phpunit-allexts
+    publishers:
+     - junit:
+        results: 'log/junit*.xml'
+     - castor-save
+     - archive-log-dir
+
+- job-template:
+    name: 'mwext-testextension-{phpflavor}-{image}-non-voting'
+    !!merge : *job_mwext-testextension-image
+    # Reinject Zuul parameters since JJB strip for some reason
+    triggers:
+     - zuul
+
 # same but with composer update instead of cloning vendor
 - job-template: &job_mwext-testextension-composer
     name: 'mwext-testextension-{phpflavor}-composer'
@@ -283,9 +310,36 @@
     triggers:
      - zuul
 
+- job-template: &job_mwext-testextension-composer-image
+    name: 'mwext-testextension-{phpflavor}-composer-{image}'
+    node: ci-{image}-wikimedia
+    concurrent: true
+    triggers:
+     - zuul
+    builders:
+     - castor-load
+     - assert-phpflavor:
+         phpflavor: '{phpflavor}'
+     - hhvm-clear-hhbc
+     - prepare-mediawiki-zuul-project-no-vendor
+     - mw-run-phpunit-allexts
+    publishers:
+     - junit:
+        results: 'log/junit*.xml'
+     - archive-log-dir
+     - castor-save
+
+- job-template:
+    name: 'mwext-testextension-{phpflavor}-composer-{image}-non-voting'
+    !!merge : *job_mwext-testextension-composer-image
+    # Reinject Zuul parameters since JJB strip for some reason
+    triggers:
+     - zuul
+
 - project:
     name: 'mwext-testextension-generic'
     jobs:
+     # Legacy permanent slaves
      - 'mwext-testextension-{phpflavor}':
         phpflavor:
             - hhvm
@@ -306,6 +360,17 @@
             - hhvm
             - php53
             - php55
+     # Nodepool
+     - 'mwext-testextension-{phpflavor}-{image}': &phpflavor_images
+         phpflavor:
+             # Change image to jessie once php 5.5 is avilable.
+             - php55:
+                 image: trusty
+             - hhvm:
+                 image: jessie
+     - 'mwext-testextension-{phpflavor}-{image}-non-voting': *phpflavor_images
+     - 'mwext-testextension-{phpflavor}-composer-{image}': *phpflavor_images
+     - 'mwext-testextension-{phpflavor}-composer-{image}-non-voting': 
*phpflavor_images
 
 - job:
     name: 'mwext-jsduck-publish'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 03ab1b2..d85d5dc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -707,7 +707,7 @@
     # Release branches do not support hhvm.
     branch: (?!REL1_23|fundraising/REL.*)
 
-  - name: ^mwext.*-hhvm$
+  - name: ^mwext.*-hhvm.*$
     # Release branches do not support hhvm.
     branch: (?!REL1_23|fundraising/REL.*)
 
@@ -978,6 +978,8 @@
     experimental:
       - mediawiki-extensions-hhvm-jessie
       - mediawiki-extensions-qunit-jessie
+      - mwext-testextension-php55-trusty
+      - mwext-testextension-hhvm-jessie
       - mwext-testextension-php53-composer
       - mwext-testextension-hhvm-composer
       - npm-node-4
@@ -995,11 +997,11 @@
      - php53lint
      - php55lint
      # Extensions tests with core+vendor
-     - mwext-testextension-hhvm-non-voting
+     - mwext-testextension-hhvm-jessie-non-voting
      - composer-validate
     php5:
      - mwext-testextension-php53-non-voting
-     - mwext-testextension-php55-non-voting
+     - mwext-testextension-php55-trusty-non-voting
     gate-and-submit:
      - noop
      - php53lint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica2be8423fe818564342bcb67204736d7e29f1bc
Gerrit-PatchSet: 17
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to