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

Change subject: Revert "Move wikimedia-fundraising-civicrm to Nodepool"
......................................................................


Revert "Move wikimedia-fundraising-civicrm to Nodepool"

drush install fails with:

WD php: CiviCRM_API3_Exception: Unknown extension: [error]
org.wikimedia.omnimail in civicrm_api3()
(line 45 of src/wikimedia/fundraising/crm/civicrm/api/api.php).
CiviCRM_API3_Exception: Unknown extension: org.wikimedia.omnimail in 
civicrm_api3()

This reverts commit 42a270506adc8ef7b209bd9303a41e7f07999f67.

Bug: T119140
Change-Id: I07c9aee3bf82369ac51f1124f2da2cce5e2b599c
---
M jjb/wm-fundraising.yaml
M zuul/layout.yaml
2 files changed, 32 insertions(+), 13 deletions(-)

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



diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 5e8e223..4998ab6 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -32,20 +32,39 @@
           $WORKSPACE/src/wikimedia/fundraising/crm/vendor/bin/phpunit \
             --log-junit $WORKSPACE/log/junit-phpunit.xml
 
+- publisher:
+    name: fundraising-crm-clean
+    publishers:
+     - postbuildscript:
+         builders:
+           - shell: |
+               # Drop the MySQL databases.
+               $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-drop-dbs.sh
+
+         # Postbuild options are confusing, setting both to false ensures the 
script always runs.
+         onsuccess: False
+         onfailure: False
+
+- project:
+    # FIXME: rename
+    name: wikimedia-fundraising-civicrm
+    jobs:
+      - wikimedia-fundraising-civicrm
+
 - job:
-    name: wikimedia-fundraising-civicrm-jessie
-    node: ci-jessie-wikimedia
+    name: wikimedia-fundraising-civicrm
+    # Run on isolated boxes because of messy MySQL behavior and unsafe fetches.
+    node: contintLabsSlave && DebianJessie
     concurrent: true
     triggers:
       - zuul
     builders:
-      - castor-load
       - fundraising-crm-install
       - fundraising-crm-phpunit
     publishers:
+      - fundraising-crm-clean
       - phpunit-junit
       - archive-log-dir
-      - castor-save
 
 - project:
     name: donationinterface-fundraising-branches-php56
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8d7cc2a..57c0fa6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -792,7 +792,7 @@
     files:
      - '^.*\.(js|json|css)$'
 
-  - name: wikimedia-fundraising-civicrm-jessie
+  - name: wikimedia-fundraising-civicrm
     branch: (?!.*deployment.*|^contrib$)
 
   # Rejecting changes having trailing whitespaces cause too many false
@@ -2416,34 +2416,34 @@
   - name: wikimedia/fundraising/crm
     test:
       - wikimedia-fundraising-crm-composer-php56-jessie
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
     gate-and-submit:
       - wikimedia-fundraising-crm-composer-php56-jessie
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/civicrm
     test:
       - php56lint
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
     gate-and-submit:
       - php56lint
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/drupal
     test:
       - php56lint
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
     gate-and-submit:
       - php56lint
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/vendor
     test:
       - php56lint
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
     gate-and-submit:
       - php56lint
-      - wikimedia-fundraising-civicrm-jessie
+      - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/php-queue
     test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07c9aee3bf82369ac51f1124f2da2cce5e2b599c
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
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

Reply via email to