Legoktm has uploaded a new change for review.

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

Change subject: Use generic tox jobs for analytics
......................................................................

Use generic tox jobs for analytics

Bug: T92557
Change-Id: I90cc46c30f164eff3147c1a0f2bc2b7abc1f2600
---
M jjb/analytics.yaml
M zuul/layout.yaml
2 files changed, 16 insertions(+), 75 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/22/196422/1

diff --git a/jjb/analytics.yaml b/jjb/analytics.yaml
index 62f5097..fd91dc1 100644
--- a/jjb/analytics.yaml
+++ b/jjb/analytics.yaml
@@ -7,34 +7,10 @@
      - python-jobs
 
 - project:
-    name: 'analytics-aggregator'
-    toxenv:
-     - flake8
-     - flake8-bin
-     - py27
-    jobs:
-     - '{name}-tox-{toxenv}'
-
-- project:
-    name: 'analytics-blog'
-    toxenv:
-     - flake8
-     - py27
-    jobs:
-     - '{name}-tox-{toxenv}'
-
-- project:
     name: 'analytics-gerrit-stats'
 
     jobs:
      - python-jobs
-
-- project:
-    name: 'analytics-geowiki'
-    toxenv:
-     - flake8
-    jobs:
-     - '{name}-tox-{toxenv}'
 
 - project:
     name: 'analytics-glass'
@@ -64,50 +40,15 @@
      - 'analytics-kraken'
 
 - project:
-    name: 'analytics-multimedia'
-    toxenv:
-     - flake8
-    jobs:
-     - '{name}-tox-{toxenv}'
-
-- project:
-    name: 'analytics-quarry-web'
-    toxenv:
-     - flake8
-    jobs:
-     - '{name}-tox-{toxenv}'
-
-- project:
     name: 'analytics-reportcard'
 
     jobs:
      - python-jobs
 
-- project:
-    name: 'analytics-wikimetrics'
-    toxenv:
-     - flake8
-    jobs:
-     - '{name}-tox-{toxenv}'
-
 # Currently non-voting, should be converted to generic
 # once passing.
 - project:
     name: 'analytics-wp-zero'
-    toxenv:
-     - flake8
-    jobs:
-     - '{name}-tox-{toxenv}'
-
-- project:
-    name: 'analytics-limn-mobile-data'
-    toxenv:
-     - flake8
-    jobs:
-     - '{name}-tox-{toxenv}'
-
-- project:
-    name: 'analytics-limn-language-data'
     toxenv:
      - flake8
     jobs:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1d688fa..325e07c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2090,27 +2090,27 @@
 
   - name: analytics/aggregator
     test:
-     - analytics-aggregator-tox-flake8
-     - analytics-aggregator-tox-flake8-bin
-     - analytics-aggregator-tox-py27
+     - tox-flake8
+     - tox-flake8-bin
+     - tox-py27
     gate-and-submit:
-     - analytics-aggregator-tox-flake8
-     - analytics-aggregator-tox-flake8-bin
-     - analytics-aggregator-tox-py27
+     - tox-flake8
+     - tox-flake8-bin
+     - tox-py27
 
   - name: analytics/blog
     test:
-     - analytics-blog-tox-flake8
-     - analytics-blog-tox-py27
+     - tox-flake8
+     - tox-py27
     gate-and-submit:
-     - analytics-blog-tox-flake8
-     - analytics-blog-tox-py27
+     - tox-flake8
+     - tox-py27
 
   - name: analytics/geowiki
     test:
-     - analytics-geowiki-tox-flake8
+     - tox-flake8
     gate-and-submit:
-     - analytics-geowiki-tox-flake8
+     - tox-flake8
 
   - name: analytics/gerrit-stats
     template:
@@ -2124,9 +2124,9 @@
 
   - name: analytics/quarry/web
     test:
-      - analytics-quarry-web-tox-flake8
+      - tox-flake8
     gate-and-submit:
-      - analytics-quarry-web-tox-flake8
+      - tox-flake8
 
   - name: analytics/kraken
     test:
@@ -2189,9 +2189,9 @@
 
   - name: analytics/wikimetrics
     test:
-     - analytics-wikimetrics-tox-flake8
+     - tox-flake8
     gate-and-submit:
-     - analytics-wikimetrics-tox-flake8
+     - tox-flake8
 
   - name: analytics/wp-zero
     test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90cc46c30f164eff3147c1a0f2bc2b7abc1f2600
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>

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

Reply via email to