diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-10-01 14:23:25 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-02-03 09:08:27 +0100 |
commit | 2e444e6e372d1370be46966e800aca073540a77f (patch) | |
tree | e93ded5e5540ef09514b7fae4a54dcc7c0ff30b7 | |
parent | 77942ad38afb982c3b7efa841a9bb0b46a0c039a (diff) | |
download | nextcloud-server-2e444e6e372d1370be46966e800aca073540a77f.tar.gz nextcloud-server-2e444e6e372d1370be46966e800aca073540a77f.zip |
setting to skip migration tests by default
* if you install owncloud via package it is not
possible to skip migration tests
* this also allows to disable migration tests for
an instance by default
-rw-r--r-- | config/config.sample.php | 9 | ||||
-rw-r--r-- | core/ajax/update.php | 6 | ||||
-rw-r--r-- | core/command/upgrade.php | 6 |
3 files changed, 21 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 3f6ae4bc3ec..2a2af19d19a 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1196,6 +1196,15 @@ $CONFIG = array( 'debug' => false, /** + * Skips the migration test during upgrades + * + * If this is set to true the migration test are deactivated during upgrade. + * This is only recommended in installations where upgrade tests are run in + * advance with the same data on a test system. + */ +'update.skip-migration-test' => false, + +/** * This entry is just here to show a warning in case somebody copied the sample * configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION! * diff --git a/core/ajax/update.php b/core/ajax/update.php index 4d8fe19f168..15daff4e1de 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -50,6 +50,12 @@ if (OC::checkUpgrade(false)) { \OC::$server->getIntegrityCodeChecker(), $logger ); + + if ($config->getSystemValue('update.skip-migration-test', false)) { + $eventSource->send('success', (string)$l->t('Migration tests are skipped - "update.skip-migration-test" is activated in config.php')); + $updater->setSimulateStepEnabled(false); + } + $incompatibleApps = []; $disabledThirdPartyApps = []; diff --git a/core/command/upgrade.php b/core/command/upgrade.php index c45984d7a30..2123efdfd38 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -99,6 +99,12 @@ class Upgrade extends Command { $updateStepEnabled = true; $skip3rdPartyAppsDisable = false; + if ($this->config->getSystemValue('update.skip-migration-test', false)) { + $output->writeln( + '<info>"skip-migration-test" is activated via config.php</info>' + ); + $simulateStepEnabled = false; + } if ($input->getOption('skip-migration-test')) { $simulateStepEnabled = false; } |