jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/363478 )

Change subject: Switch all fundraising tests to PHP5.6
......................................................................


Switch all fundraising tests to PHP5.6

To match production.

Bug: T169806
Change-Id: Iaaa0ea5958ff4eca61f569134d7e0fd786111ebf
---
M jjb/wm-fundraising.yaml
M zuul/layout.yaml
2 files changed, 24 insertions(+), 23 deletions(-)

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



diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 8023a3b..b682639 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -4,8 +4,8 @@
       - '{name}-npm-node-6-jessie'
       - '{name}-composer-{phpflavor}-{image}':
           phpflavor:
-              - php55:
-                  image: trusty
+              - php56:
+                  image: jessie
 
 - builder:
     name: fundraising-crm-install
@@ -55,7 +55,7 @@
 - job:
     name: wikimedia-fundraising-civicrm
     # Run on isolated boxes because of messy MySQL behavior and unsafe fetches.
-    node: contintLabsSlave && UbuntuTrusty
+    node: contintLabsSlave && DebianJessie
     concurrent: true
     triggers:
       - zuul
@@ -68,22 +68,22 @@
       - archive-log-dir
 
 - project:
-    name: donationinterface-fundraising-branches-php55
+    name: donationinterface-fundraising-branches-php56
     branch:
      - REL1_27
      - REL1_28
     jobs:
-     - mwext-donationinterfacecore-{branch}-zend55-trusty:
+     - mwext-donationinterfacecore-{branch}-zend56-jessie:
 
 - job-template:
-    name: 'mwext-donationinterfacecore-{branch}-zend55-trusty'
-    node: ci-trusty-wikimedia
+    name: 'mwext-donationinterfacecore-{branch}-zend56-jessie'
+    node: ci-jessie-wikimedia
     concurrent: true
     triggers:
      - zuul
     builders:
      - assert-phpflavor:
-         phpflavor: 'php55'
+         phpflavor: 'php56'
      - castor-load
      - prepare-mediawiki-branch:
          branch: '{branch}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 55404bc..0c7b4c5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -753,12 +753,13 @@
   - name: ^mwext-testextension-hhvm
     skip-if:
       - project: ^mediawiki/extensions/DonationInterface$
-  - name: ^mwext-donationinterfacecore-REL1_(27|28)-zend55-trusty$
+  - name: ^mwext-donationinterfacecore-REL1_(27|28)-zend56-jessie$
     skip-if:
       - project: ^mediawiki/extensions/DonationInterface$
         branch: ^deployment$
   # FIXME when made voting, add it to gate-and-submit
-  - name: mwext-donationinterfacecore-REL1_28-zend55-trusty
+  # also FIXME: do we actually want to keep testing on 1.28?
+  - name: ^mwext-donationinterfacecore-REL1_28-zend56-jessie$
     voting: false
 
   # Jobs testing multiple extensions together
@@ -2389,36 +2390,36 @@
 
   - name: wikimedia/fundraising/crm
     test:
-      - wikimedia-fundraising-crm-composer-php55-trusty
+      - wikimedia-fundraising-crm-composer-php56-jessie
       - wikimedia-fundraising-crm-npm-node-6-jessie
       - wikimedia-fundraising-civicrm
     gate-and-submit:
-      - wikimedia-fundraising-crm-composer-php55-trusty
+      - wikimedia-fundraising-crm-composer-php56-jessie
       - wikimedia-fundraising-crm-npm-node-6-jessie
       - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/civicrm
     test:
-      - php55lint
+      - php56lint
       - wikimedia-fundraising-civicrm
     gate-and-submit:
-      - php55lint
+      - php56lint
       - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/drupal
     test:
-      - php55lint
+      - php56lint
       - wikimedia-fundraising-civicrm
     gate-and-submit:
-      - php55lint
+      - php56lint
       - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/vendor
     test:
-      - php55lint
+      - php56lint
       - wikimedia-fundraising-civicrm
     gate-and-submit:
-      - php55lint
+      - php56lint
       - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/php-queue
@@ -2972,13 +2973,13 @@
       - name: extension-unittests-non-voting
       - name: mwgate-npm
     test:
-      - mwext-donationinterfacecore-REL1_27-zend55-trusty
-      - mwgate-php55lint
+      - mwext-donationinterfacecore-REL1_27-zend56-jessie
+      - mwgate-php56lint
     gate-and-submit:
-      - mwext-donationinterfacecore-REL1_27-zend55-trusty
-      - mwgate-php55lint
+      - mwext-donationinterfacecore-REL1_27-zend56-jessie
+      - mwgate-php56lint
     experimental:
-      - mwext-donationinterfacecore-REL1_28-zend55-trusty
+      - mwext-donationinterfacecore-REL1_28-zend56-jessie
 
   - name: mediawiki/extensions/DoubleWiki
     template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaaa0ea5958ff4eca61f569134d7e0fd786111ebf
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
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