Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/195074

Change subject: CRM job can be run on submodules
......................................................................

CRM job can be run on submodules

Use zuul-cloner to fetch the submodules, so we're testing new changes.

Also eliminates some jslint jobs on contrib repos, which will always fail.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/74/195074/1

diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 3d7d1a0..2c08ea6 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -48,16 +48,15 @@
     builders:
       - zuul-cloner:
           projects: >
-            wikimedia/fundraising/crm
             wikimedia/fundraising/civicrm-buildkit
+            wikimedia/fundraising/crm
+            wikimedia/fundraising/crm/civicrm
+            wikimedia/fundraising/crm/drupal
+            wikimedia/fundraising/crm/vendor
       - shell: |
           # FIXME: temporarily lock to future rev, until CR
           cd $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit
           git fetch 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/civicrm-buildkit 
refs/changes/55/195055/1 && git checkout FETCH_HEAD
-
-          # FIXME: zuul-cloner should do this for us.  See 
https://phabricator.wikimedia.org/T45045
-          cd $WORKSPACE/src/wikimedia/fundraising/crm
-          git submodule update -i --recursive
       - shell: |
           $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-create-dbs.sh
           $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-populate-dbs.sh
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9236b8e..617fddf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -716,10 +716,6 @@
     voting: false
   - name: mwext-skins-jslint
     voting: false
-  - name: wikimedia-fundraising-crm-civicrm-jslint
-    voting: false
-  - name: wikimedia-fundraising-crm-drupal-jslint
-    voting: false
   - name: wikimedia-fundraising-crm-jslint
     voting: false
 # Start of new currently disabled extensions checks from mass extension import 
- Addshore
@@ -2791,20 +2787,34 @@
       - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/civicrm
-    check-voter:
-      - wikimedia-fundraising-crm-civicrm-jslint
+    check:
       - phplint
+    test:
+      - phplint
+      - wikimedia-fundraising-civicrm
     gate-and-submit:
-      - wikimedia-fundraising-crm-civicrm-jslint
       - phplint
+      - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/drupal
-    check-voter:
-      - wikimedia-fundraising-crm-drupal-jslint
+    check:
       - phplint
+    test:
+      - phplint
+      - wikimedia-fundraising-civicrm
     gate-and-submit:
-      - wikimedia-fundraising-crm-drupal-jslint
       - phplint
+      - wikimedia-fundraising-civicrm
+
+  - name: wikimedia/fundraising/crm/vendor
+    check:
+      - phplint
+    test:
+      - phplint
+      - wikimedia-fundraising-civicrm
+    gate-and-submit:
+      - phplint
+      - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/slander
     template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I895a1091ae49827a0e333e40771fe0dbdd1c2f5b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to