summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Andrzej Jaworski2016-12-17 12:49:33 (GMT)
committerAdam Andrzej Jaworski2016-12-17 12:49:33 (GMT)
commitbc5e05fa9394ad51d6c3dff4ff65ce419f073f81 (patch)
treea7d73cfa5dd83919882e174210ef16ad4d501620
parentb9614e3968153abe8cdb7c64958302543cf7e6dd (diff)
parent6621cb8f8aca5c485da593299d270ce7c6b7d0c3 (diff)
Merge remote-tracking branch 'origin/7.x-3.x' into 3.x.x-devBOA-3.1.4
-rw-r--r--aegir-release.make9
-rw-r--r--debian/changelog9
-rw-r--r--migrate.hostmaster.inc19
-rw-r--r--platform/drupal/packages_8.inc2
-rw-r--r--platform/migrate.provision.inc2
-rw-r--r--provision.api.php10
-rwxr-xr-xrelease.sh13
7 files changed, 56 insertions, 8 deletions
diff --git a/aegir-release.make b/aegir-release.make
index 528e585..bfd4b03 100644
--- a/aegir-release.make
+++ b/aegir-release.make
@@ -4,7 +4,10 @@
core = 7.x
api = 2
-; this makefile fetches the latest release from Drupal.org
-; it is maintained through the release.sh script
-projects[hostmaster][type] = "core"
+; This makefile fetches the latest release of Drupal from Drupal.org.
+projects[drupal][type] = "core"
+
+; The release.sh script updates the version of hostmaster.
projects[hostmaster][version] = "7.x-3.0-dev"
+projects[hostmaster][type] = "profile"
+projects[hostmaster][variant] = "projects"
diff --git a/debian/changelog b/debian/changelog
index 0d0010c..f2437c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+aegir3-provision (3.9~beta1) unstable; urgency=medium
+
+ * Preparations for the 3.9 release
+ * Makefile tweaks to allow for minor releases to update Drupal core
+ * Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.9
+
+
+ -- Herman van Rink <helmo@initfour.nl> Thu, 15 Dec 2016 21:15:10 +0100
+
aegir3-provision (3.8) unstable; urgency=medium
* Another stable release of the 3.x series.
diff --git a/migrate.hostmaster.inc b/migrate.hostmaster.inc
index e77ce72..b46e1c3 100644
--- a/migrate.hostmaster.inc
+++ b/migrate.hostmaster.inc
@@ -3,6 +3,19 @@
/**
* @file manual site migrate system
*/
+
+/**
+ * Convert a directory name to a drush aliasname, stripping unwanted chars.
+ *
+ * @param string $name The directory name.
+ *
+ * @return string
+ * A drush alias name for the platform.
+ */
+function _provision_path_to_platform_alias($name) {
+ return '@platform_' . preg_replace("/[!\W]/", "", basename(rtrim($name, '/')));
+}
+
function drush_provision_hostmaster_migrate_validate($site, $platform) {
// XXX: this doesn't actually document the pre alpha9 upgrade path
drush_print('
@@ -43,7 +56,7 @@ We are making the following assumptions:
drush_set_option('site_name', '@hostmaster');
drush_set_option('old_platform', d('@hostmaster')->platform->name);
- $new_platform = '@platform_' . preg_replace("/[!\W]/", "", basename(rtrim($platform, '/')));
+ $new_platform = _provision_path_to_platform_alias($platform);
drush_invoke_process('@none', "provision-save", array($new_platform), array(
'context_type' => 'platform',
'server' => '@server_master',
@@ -95,7 +108,7 @@ We are making the following assumptions:
}
- $old_platform = '@platform_' . preg_replace("/[!\W]/", "", basename(rtrim($data['publish_path'], '/')));
+ $old_platform = _provision_path_to_platform_alias($data['publish_path']);
drush_invoke_process('@none', "provision-save", array($old_platform), array(
'context_type' => 'platform',
'server' => $server,
@@ -109,7 +122,7 @@ We are making the following assumptions:
return false;
}
- $new_platform = '@platform_' . preg_replace("/[!\W]/", "", basename(rtrim($platform, '/')));
+ $new_platform = _provision_path_to_platform_alias($platform);
drush_invoke_process('@none', "provision-save", array($new_platform), array(
'context_type' => 'platform',
'server' => $server,
diff --git a/platform/drupal/packages_8.inc b/platform/drupal/packages_8.inc
index 86da08f..272c3a6 100644
--- a/platform/drupal/packages_8.inc
+++ b/platform/drupal/packages_8.inc
@@ -99,6 +99,8 @@ function _provision_system_query($type) {
if ($frags[0] == 'sites' && $frags[1] != 'all') {
$package->platform = -1;
}
+ // In Drupal 8, system_get_info returns enabled modules/themes.
+ $package->status = 1;
$package->filename = realpath($package->filename);
diff --git a/platform/migrate.provision.inc b/platform/migrate.provision.inc
index 739a492..774b89d 100644
--- a/platform/migrate.provision.inc
+++ b/platform/migrate.provision.inc
@@ -80,7 +80,7 @@ function drush_provision_drupal_provision_migrate($platform, $new_name = NULL) {
// If the site is migrated between platforms and not just renamed,
// we should update the info collected about source and target platform first.
// Note that we have to exclude Hostmaster platform from this extra verify.
- if (!provision_is_hostmaster_site()) {
+ if (!provision_is_hostmaster_site() && drush_get_option('provision_verify_platforms_before_migrate', TRUE)) {
if (!is_null(d($platform)->name) && (d($platform)->name != d()->platform->name)) {
provision_backend_invoke('@hostmaster', 'hosting-task', array(d()->platform->name, 'verify'), array('force' => TRUE));
sleep(5); // A small trick to avoid high load and race conditions.
diff --git a/provision.api.php b/provision.api.php
index 436cbcd..3f491ff 100644
--- a/provision.api.php
+++ b/provision.api.php
@@ -7,6 +7,16 @@
* @see drush_command_invoke_all()
*/
+/**
+ * Possible variables to set in local.drushrc.php or another drushrc location Drush supports.
+ *
+ * usage:
+ * $options['provision_backup_suffix'] = '.tar.bz2';
+ *
+ * provision_verify_platforms_before_migrate - When migrating many sites turning this off can save time, default TRUE.
+ * provision_backup_suffix - Method to set the compression used for backups... e.g. '.tar.bz2' or '.tar.', defaults to '.tar.gz'.
+ *
+ */
/**
* Implements hook_drush_load(). Deprecated. Removed in Drush 7.x.
diff --git a/release.sh b/release.sh
index efa1d7f..58e53f6 100755
--- a/release.sh
+++ b/release.sh
@@ -80,7 +80,7 @@ dch -v $debversion -D unstable
git add debian/changelog
echo changing hostmaster version in aegir-release.make
-sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$major-$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
+sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
echo enabling release makefilexs
ln -sf aegir-release.make aegir.make && git add aegir.make
@@ -125,9 +125,20 @@ mkdir -p build-area;
rm -rf build-area/hostmaster
git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hostmaster/'` build-area/hostmaster
+cd build-area/hostmaster
+echo changing hostmaster.make versions
+ln -sf drupal-org.make hostmaster.make && git add hostmaster.make
+cd -
+
+git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git commit -m"change version information for release $version"
+
echo "Setting the tag $NEW_TAG in a clean hostmaster clone."
git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git tag -a $NEW_TAG -m 'Add a new release tag.'
+echo reverting tree to HEAD versions
+git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git revert HEAD
+
+
# Hosting
rm -rf build-area/hosting
git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hosting/'` build-area/hosting