jenkins-bot has submitted this change and it was merged.

Change subject: Move layout to new /jjb/ subdirectory
......................................................................


Move layout to new /jjb/ subdirectory

This is to prepare the merge of the repositories integration/zuul-config
and integration/jenkins-job-builder-config

Update paths in integration-jjb-config-diff.

Change-Id: I739b148e90374a90eb495f0d5f40af54475ba5e1
---
R jjb/analytics.yaml
R jjb/beta.yaml
R jjb/browsertests.yaml
R jjb/cxserver.yaml
R jjb/defaults.yaml
R jjb/doc.yaml
R jjb/experiment.yaml
R jjb/integration.yaml
R jjb/job-templates-browsertests.yaml
R jjb/job-templates.yaml
R jjb/labs.yaml
R jjb/macro-scm.yaml
R jjb/macro.yaml
R jjb/mediawiki-extensions.yaml
R jjb/mediawiki-misc.yaml
R jjb/mediawiki-services.yaml
R jjb/mediawiki-skins.yaml
R jjb/mediawiki-tools.yaml
R jjb/mediawiki.yaml
R jjb/misc.yaml
R jjb/mobile.yaml
R jjb/operations-apache-config.yaml
R jjb/operations-debs.yaml
R jjb/operations-misc.yaml
R jjb/operations-mw-config.yaml
R jjb/operations-puppet.yaml
R jjb/parsoidsvc.yaml
R jjb/phabricator.yaml
R jjb/php-extensions.yaml
R jjb/php.yaml
R jjb/python-jobs.yaml
R jjb/pywikibot.yaml
R jjb/ruby-jobs.yaml
R jjb/sartoris.yaml
R jjb/search.yaml
R jjb/translatewiki.yaml
R jjb/wikidata.yaml
R jjb/wm-bots.yaml
R jjb/wm-bugzilla-wikibugs.yaml
R jjb/wm-fundraising.yaml
R jjb/wm-misc.yaml
41 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/analytics.yaml b/jjb/analytics.yaml
similarity index 100%
rename from analytics.yaml
rename to jjb/analytics.yaml
diff --git a/beta.yaml b/jjb/beta.yaml
similarity index 100%
rename from beta.yaml
rename to jjb/beta.yaml
diff --git a/browsertests.yaml b/jjb/browsertests.yaml
similarity index 100%
rename from browsertests.yaml
rename to jjb/browsertests.yaml
diff --git a/cxserver.yaml b/jjb/cxserver.yaml
similarity index 100%
rename from cxserver.yaml
rename to jjb/cxserver.yaml
diff --git a/defaults.yaml b/jjb/defaults.yaml
similarity index 100%
rename from defaults.yaml
rename to jjb/defaults.yaml
diff --git a/doc.yaml b/jjb/doc.yaml
similarity index 100%
rename from doc.yaml
rename to jjb/doc.yaml
diff --git a/experiment.yaml b/jjb/experiment.yaml
similarity index 100%
rename from experiment.yaml
rename to jjb/experiment.yaml
diff --git a/integration.yaml b/jjb/integration.yaml
similarity index 95%
rename from integration.yaml
rename to jjb/integration.yaml
index bddec2b..8d078f4 100644
--- a/integration.yaml
+++ b/jjb/integration.yaml
@@ -88,11 +88,11 @@
         export PY_COLORS=1
 
         echo "Generating config for proposed patchset..."
-        tox -e venv -- jenkins-jobs test "$WORKSPACE/config" -o 
"$WORKSPACE/output-proposed"
+        tox -e venv -- jenkins-jobs test "$WORKSPACE/config/jjb" -o 
"$WORKSPACE/output-proposed"
 
         echo "Generating reference config from parent..."
         (cd $WORKSPACE/config; git checkout HEAD^)
-        tox -e venv -- jenkins-jobs test "$WORKSPACE/config" -o 
"$WORKSPACE/output-parent"
+        tox -e venv -- jenkins-jobs test "$WORKSPACE/config/jjb" -o 
"$WORKSPACE/output-parent"
 
         echo "--------------------------------------------"
         echo "File changed:"
diff --git a/job-templates-browsertests.yaml 
b/jjb/job-templates-browsertests.yaml
similarity index 100%
rename from job-templates-browsertests.yaml
rename to jjb/job-templates-browsertests.yaml
diff --git a/job-templates.yaml b/jjb/job-templates.yaml
similarity index 100%
rename from job-templates.yaml
rename to jjb/job-templates.yaml
diff --git a/labs.yaml b/jjb/labs.yaml
similarity index 100%
rename from labs.yaml
rename to jjb/labs.yaml
diff --git a/macro-scm.yaml b/jjb/macro-scm.yaml
similarity index 100%
rename from macro-scm.yaml
rename to jjb/macro-scm.yaml
diff --git a/macro.yaml b/jjb/macro.yaml
similarity index 100%
rename from macro.yaml
rename to jjb/macro.yaml
diff --git a/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
similarity index 100%
rename from mediawiki-extensions.yaml
rename to jjb/mediawiki-extensions.yaml
diff --git a/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
similarity index 100%
rename from mediawiki-misc.yaml
rename to jjb/mediawiki-misc.yaml
diff --git a/mediawiki-services.yaml b/jjb/mediawiki-services.yaml
similarity index 100%
rename from mediawiki-services.yaml
rename to jjb/mediawiki-services.yaml
diff --git a/mediawiki-skins.yaml b/jjb/mediawiki-skins.yaml
similarity index 100%
rename from mediawiki-skins.yaml
rename to jjb/mediawiki-skins.yaml
diff --git a/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml
similarity index 100%
rename from mediawiki-tools.yaml
rename to jjb/mediawiki-tools.yaml
diff --git a/mediawiki.yaml b/jjb/mediawiki.yaml
similarity index 100%
rename from mediawiki.yaml
rename to jjb/mediawiki.yaml
diff --git a/misc.yaml b/jjb/misc.yaml
similarity index 100%
rename from misc.yaml
rename to jjb/misc.yaml
diff --git a/mobile.yaml b/jjb/mobile.yaml
similarity index 100%
rename from mobile.yaml
rename to jjb/mobile.yaml
diff --git a/operations-apache-config.yaml b/jjb/operations-apache-config.yaml
similarity index 100%
rename from operations-apache-config.yaml
rename to jjb/operations-apache-config.yaml
diff --git a/operations-debs.yaml b/jjb/operations-debs.yaml
similarity index 100%
rename from operations-debs.yaml
rename to jjb/operations-debs.yaml
diff --git a/operations-misc.yaml b/jjb/operations-misc.yaml
similarity index 100%
rename from operations-misc.yaml
rename to jjb/operations-misc.yaml
diff --git a/operations-mw-config.yaml b/jjb/operations-mw-config.yaml
similarity index 100%
rename from operations-mw-config.yaml
rename to jjb/operations-mw-config.yaml
diff --git a/operations-puppet.yaml b/jjb/operations-puppet.yaml
similarity index 100%
rename from operations-puppet.yaml
rename to jjb/operations-puppet.yaml
diff --git a/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
similarity index 100%
rename from parsoidsvc.yaml
rename to jjb/parsoidsvc.yaml
diff --git a/phabricator.yaml b/jjb/phabricator.yaml
similarity index 100%
rename from phabricator.yaml
rename to jjb/phabricator.yaml
diff --git a/php-extensions.yaml b/jjb/php-extensions.yaml
similarity index 100%
rename from php-extensions.yaml
rename to jjb/php-extensions.yaml
diff --git a/php.yaml b/jjb/php.yaml
similarity index 100%
rename from php.yaml
rename to jjb/php.yaml
diff --git a/python-jobs.yaml b/jjb/python-jobs.yaml
similarity index 100%
rename from python-jobs.yaml
rename to jjb/python-jobs.yaml
diff --git a/pywikibot.yaml b/jjb/pywikibot.yaml
similarity index 100%
rename from pywikibot.yaml
rename to jjb/pywikibot.yaml
diff --git a/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
similarity index 100%
rename from ruby-jobs.yaml
rename to jjb/ruby-jobs.yaml
diff --git a/sartoris.yaml b/jjb/sartoris.yaml
similarity index 100%
rename from sartoris.yaml
rename to jjb/sartoris.yaml
diff --git a/search.yaml b/jjb/search.yaml
similarity index 100%
rename from search.yaml
rename to jjb/search.yaml
diff --git a/translatewiki.yaml b/jjb/translatewiki.yaml
similarity index 100%
rename from translatewiki.yaml
rename to jjb/translatewiki.yaml
diff --git a/wikidata.yaml b/jjb/wikidata.yaml
similarity index 100%
rename from wikidata.yaml
rename to jjb/wikidata.yaml
diff --git a/wm-bots.yaml b/jjb/wm-bots.yaml
similarity index 100%
rename from wm-bots.yaml
rename to jjb/wm-bots.yaml
diff --git a/wm-bugzilla-wikibugs.yaml b/jjb/wm-bugzilla-wikibugs.yaml
similarity index 100%
rename from wm-bugzilla-wikibugs.yaml
rename to jjb/wm-bugzilla-wikibugs.yaml
diff --git a/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
similarity index 100%
rename from wm-fundraising.yaml
rename to jjb/wm-fundraising.yaml
diff --git a/wm-misc.yaml b/jjb/wm-misc.yaml
similarity index 100%
rename from wm-misc.yaml
rename to jjb/wm-misc.yaml

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I739b148e90374a90eb495f0d5f40af54475ba5e1
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Cmcmahon <cmcma...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Vikassy <vikasyaligar...@gmail.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.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