summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-02 12:15:23 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-02 12:15:23 +0200
commitd0f6bfe7b6bca148d0a8ee551fe9b28951ce5d55 (patch)
treefd6609af3a6bd980ed114115455ec038085493c6 /core
parent8944cb539ef565db4bb9f05d225449afa0d20cfb (diff)
parent7cbdd9b90bcea3566b7d0198f23da3d427e6ef45 (diff)
downloadnextcloud-server-d0f6bfe7b6bca148d0a8ee551fe9b28951ce5d55.tar.gz
nextcloud-server-d0f6bfe7b6bca148d0a8ee551fe9b28951ce5d55.zip
Merge pull request #19508 from owncloud/setting-to-skip-migration-tests
setting to skip migration tests by default
Diffstat (limited to 'core')
-rw-r--r--core/ajax/update.php11
-rw-r--r--core/command/upgrade.php8
2 files changed, 17 insertions, 2 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index ff18d2bc04b..11d159f15d1 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -41,12 +41,21 @@ if (OC::checkUpgrade(false)) {
// avoid side effects
\OC_User::setIncognitoMode(true);
+
+
$logger = \OC::$server->getLogger();
+ $config = \OC::$server->getConfig();
$updater = new \OC\Updater(
\OC::$server->getHTTPHelper(),
- \OC::$server->getConfig(),
+ $config,
$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 fa160d9a1c0..f50a0d92479 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -92,6 +92,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;
}
@@ -119,7 +125,7 @@ class Upgrade extends Command {
$self = $this;
$updater = new Updater(\OC::$server->getHTTPHelper(),
- \OC::$server->getConfig());
+ $this->config);
$updater->setSimulateStepEnabled($simulateStepEnabled);
$updater->setUpdateStepEnabled($updateStepEnabled);