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

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


Move wikimedia-fundraising-civicrm to Nodepool

Still on Trusty instances. The job now runs in a fresh env hence the
post build step to clear out the database is no more needed.

Add castor support to save/restore the composer cache.

Rename:
- wikimedia-fundraising-civicrm
+ wikimedia-fundraising-civicrm-jessie

Since the Nodepool instances lack sendmail, we gotta point PHP to use
/usr/bin/true else the Drupal installer fails.

Done via: https://gerrit.wikimedia.org/r/#/c/363141/

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

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



diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 4998ab6..5e8e223 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -32,39 +32,20 @@
           $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
-    # Run on isolated boxes because of messy MySQL behavior and unsafe fetches.
-    node: contintLabsSlave && DebianJessie
+    name: wikimedia-fundraising-civicrm-jessie
+    node: ci-jessie-wikimedia
     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 57c0fa6..8d7cc2a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -792,7 +792,7 @@
     files:
      - '^.*\.(js|json|css)$'
 
-  - name: wikimedia-fundraising-civicrm
+  - name: wikimedia-fundraising-civicrm-jessie
     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
+      - wikimedia-fundraising-civicrm-jessie
     gate-and-submit:
       - wikimedia-fundraising-crm-composer-php56-jessie
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
 
   - name: wikimedia/fundraising/crm/civicrm
     test:
       - php56lint
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
     gate-and-submit:
       - php56lint
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
 
   - name: wikimedia/fundraising/crm/drupal
     test:
       - php56lint
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
     gate-and-submit:
       - php56lint
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
 
   - name: wikimedia/fundraising/crm/vendor
     test:
       - php56lint
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
     gate-and-submit:
       - php56lint
-      - wikimedia-fundraising-civicrm
+      - wikimedia-fundraising-civicrm-jessie
 
   - name: wikimedia/fundraising/php-queue
     test:

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

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