[152532] contrib/mp-buildbot

[larryv at macports.org]

Revision: 152532
          https://trac.macports.org/changeset/152532
Author:   larryv at macports.org
Date:     2016-09-11 18:59:12 -0700 (Sun, 11 Sep 2016)
Log Message:
-----------
mpbb: Move jobs tools and ports tree

After the upcoming GitHub migration, the ports tree will be served from
https://github.com/macports/ports.git, while the jobs tools will be in
the `jobs` subdirectory of https://github.com/macports/infrastructure.git.
Relocate the checkouts to accommodate Git's relative inflexibility.
(Subversion can selectively check out arbitrary subdirectories, so this
doesn't affect it.)

Automatically removing the old checkouts seems too bold, so just print
informational messages.

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb
    contrib/mp-buildbot/mpbb-checkout

Modified: contrib/mp-buildbot/mpbb
===================================================================
--- contrib/mp-buildbot/mpbb	2016-09-12 01:59:10 UTC (rev 152531)
+++ contrib/mp-buildbot/mpbb	2016-09-12 01:59:12 UTC (rev 152532)
@@ -119,9 +119,19 @@
 
 # shellcheck disable=SC2034 disable=SC2154
 # Not really options, but pretend they are because they're global.
-option_jobs_dir=${option_work_dir}/tools
+option_jobs_dir=${option_work_dir}/infrastructure/jobs
 option_log_dir=${option_work_dir}/logs
 
+# Inform the user if old repositories are still present.
+if [[ -d ${option_work_dir}/tools/.svn ]]; then
+    msg "\`${option_work_dir}/tools' is no longer used for the jobs" \
+        'tools and may be deleted'
+fi
+if [[ -d ${option_work_dir}/dports/.svn ]]; then
+    msg "\`${option_work_dir}/dports' is no longer used for the ports" \
+        'tree and may be deleted'
+fi
+
 # shellcheck disable=SC2086
 # Set up the positional arguments for the subcommand. With "set -u"
 # enabled, "${foo[@]}" doesn't work if foo is empty.

Modified: contrib/mp-buildbot/mpbb-checkout
===================================================================
--- contrib/mp-buildbot/mpbb-checkout	2016-09-12 01:59:10 UTC (rev 152531)
+++ contrib/mp-buildbot/mpbb-checkout	2016-09-12 01:59:12 UTC (rev 152532)
@@ -89,7 +89,7 @@
     fi
 
     # shellcheck disable=SC2154
-    local -r ports_dir=${option_work_dir}/dports
+    local -r ports_dir=${option_work_dir}/ports
 
     local checkout jobs_dir svn
     # shellcheck disable=SC2100 disable=SC2154
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160911/e7bd9fc9/attachment-0001.html>