Hashar has uploaded a new change for review.

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


Change subject: Revert "migrate various jobs to be runnable on slaves"
......................................................................

Revert "migrate various jobs to be runnable on slaves"

--references with http backend does not really works with the huge
repository operations/puppet. Need to investigate.

This reverts commit 0a331dfae287ee601147efdd66dfcaf1be76d449.

Change-Id: I5c25eae8620805f05d5d0ae69c7618473e237f48
---
M analytics.disabled
M integration.yaml
M job-templates.yaml
M operations-apache-config.yaml
M operations-debs.yaml
M operations-misc.yaml
M operations-mw-config.yaml
M operations-puppet.yaml
M php-extensions.yaml
M wm-bugzilla-wikibugs.yaml
10 files changed, 33 insertions(+), 36 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/49/82249/1

diff --git a/analytics.disabled b/analytics.disabled
index e7b7da8..e1ea8bf 100644
--- a/analytics.disabled
+++ b/analytics.disabled
@@ -12,7 +12,7 @@
 
 - job-template:
     name: 'analytics-libanon'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -50,7 +50,7 @@
 
 - job-template:
     name: 'analytics-udp-filters'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -89,7 +89,7 @@
 
 - job-template:
     name: 'analytics-webstatscollector'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -112,7 +112,7 @@
 
 - job-template:
     name: 'analytics-wikistats'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
diff --git a/integration.yaml b/integration.yaml
index 5f266d0..43cc538 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -53,8 +53,7 @@
 # Job to check JJB config
 - job-template:
     name: 'integration-jjb-config-test'
-    node: gallium  # FIXME: just to be safe in case we are missing python 
dependencies
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     scm:
diff --git a/job-templates.yaml b/job-templates.yaml
index a71050e..ec556b2 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -3,7 +3,7 @@
 - job-template:
     name: '{name}-erblint-HEAD'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
@@ -13,7 +13,7 @@
 - job-template:
     name: '{name}-jslint'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     scm:
@@ -25,7 +25,7 @@
 - job-template:
     name: '{name}-pplint-HEAD'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
@@ -34,7 +34,7 @@
 - job-template:
     name: '{name}-perllint'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
@@ -43,7 +43,7 @@
 - job-template:
     name: '{name}-phplint'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
@@ -53,7 +53,7 @@
 - job-template:
     name: '{name}-phpcs'
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
@@ -72,7 +72,7 @@
 - job-template:
     name: '{name}-phpcs-HEAD'
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
@@ -90,7 +90,7 @@
 - job-template:
     name: '{name}-phpcs-strict'
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
@@ -108,7 +108,7 @@
 - job-template:
     name: '{name}-phpcs-strict-HEAD'
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
@@ -126,7 +126,7 @@
 - job-template:
     name: '{name}-phpcs-lenient'
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
@@ -144,7 +144,7 @@
 - job-template:
     name: '{name}-phpcs-lenient-HEAD'
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
@@ -161,7 +161,7 @@
 
 - job-template:
     name: '{name}-puppet-validate'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -171,7 +171,7 @@
 
 - job-template:
     name: '{name}-rubylint'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -182,7 +182,7 @@
 
 - job-template:
     name: '{name}-ruby1.8lint'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -193,7 +193,7 @@
 
 - job-template:
     name: '{name}-ruby1.9.3lint'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -206,7 +206,7 @@
     name: '{name}-yamllint'
     node: hasSlaveScripts
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
diff --git a/operations-apache-config.yaml b/operations-apache-config.yaml
index 37a1f13..ad6b2ce 100644
--- a/operations-apache-config.yaml
+++ b/operations-apache-config.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'operations-apache-config-lint'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
diff --git a/operations-debs.yaml b/operations-debs.yaml
index 4e5bc9e..146c2e4 100644
--- a/operations-debs.yaml
+++ b/operations-debs.yaml
@@ -13,7 +13,7 @@
 - job-template:
     name: '{name}-debbuild'
     node: gallium  # requires packages-builder
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     scm:
      - git-deb-package
@@ -25,7 +25,7 @@
 
 - job-template:
     name: '{name}-antbuild'
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
 
diff --git a/operations-misc.yaml b/operations-misc.yaml
index c49e8c4..192ac30 100644
--- a/operations-misc.yaml
+++ b/operations-misc.yaml
@@ -15,8 +15,7 @@
 
 - job-template:
     name: 'operations-dns-lint'
-    node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml
index 0f43c4b..cdfe31f 100644
--- a/operations-mw-config.yaml
+++ b/operations-mw-config.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'operations-mw-config-tests'
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index 67de4be..c339b61 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'operations-puppet-validate'
     node: gallium  # relies on /srv/ssd/zuul/git/operations/puppet
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -32,7 +32,7 @@
 - job-template:
     name: 'operations-puppet-test'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -45,7 +45,7 @@
 - job-template:
     name: 'operations-puppet-pep8'
     node: hasSlaveScripts
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
@@ -64,7 +64,7 @@
 - job-template:
     name: 'operations-puppet-doc'
     node: gallium
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     workspace: '/srv/org/wikimedia/doc/puppetsource'
@@ -80,7 +80,7 @@
 # Find out common typos in any files of ops/puppet
 - job-template:
     name: 'operations-puppet-typos'
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul
diff --git a/php-extensions.yaml b/php-extensions.yaml
index 3d98007..44b3a2a 100644
--- a/php-extensions.yaml
+++ b/php-extensions.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'php-{name}-build'
     node: hasContintPackages  # needs phpize
-    defaults: use-remote-zuul
+    defaults: use-zuul
     triggers:
      - zuul
     builders:
diff --git a/wm-bugzilla-wikibugs.yaml b/wm-bugzilla-wikibugs.yaml
index 932a686..d3ed79e 100644
--- a/wm-bugzilla-wikibugs.yaml
+++ b/wm-bugzilla-wikibugs.yaml
@@ -3,9 +3,8 @@
 # perl scripts.
 - job-template:
     name: 'wikimedia-bugzilla-wikibugs-perllint'
-    node: hasSlaveScripts
 
-    defaults: use-remote-zuul
+    defaults: use-zuul
 
     triggers:
      - zuul

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c25eae8620805f05d5d0ae69c7618473e237f48
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>

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

Reply via email to