diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-03 13:35:16 +0300 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-03 13:35:16 +0300 |
commit | a66a57585950dca3264954c4f31dff6f735c905b (patch) | |
tree | d984ab6322437fadd7469a4dfb14e4b42cb9afe7 | |
parent | d66a836251c6c17b31331f2a2816d5ccb059997d (diff) | |
parent | 2e444e6e372d1370be46966e800aca073540a77f (diff) |
Merge pull request #22090 from owncloud/skip-migration-tests-setting
setting to skip migration tests 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; } |