diff --git a/config/autoload/errorhandler.local.dist.php b/config/autoload/errorhandler.local.dist.php new file mode 100644 index 0000000..de70e4f --- /dev/null +++ b/config/autoload/errorhandler.local.dist.php @@ -0,0 +1,21 @@ + [ + 'invokables' => [ + 'Zend\Expressive\Whoops' => Whoops\Run::class, + 'Zend\Expressive\WhoopsPageHandler' => Whoops\Handler\PrettyPageHandler::class, + ], + 'factories' => [ + 'Zend\Expressive\FinalHandler' => Zend\Expressive\Container\WhoopsErrorHandlerFactory::class, + ], + ], + + 'whoops' => [ + 'json_exceptions' => [ + 'display' => true, + 'show_trace' => true, + 'ajax_only' => true, + ], + ], +]; diff --git a/config/autoload/los-basepath.local.dist.php b/config/autoload/los-basepath.local.dist.php new file mode 100644 index 0000000..3e67a9f --- /dev/null +++ b/config/autoload/los-basepath.local.dist.php @@ -0,0 +1,21 @@ + '', + + 'dependencies' => [ + 'factories' => [ + LosMiddleware\BasePath\BasePath::class => LosMiddleware\BasePath\BasePathFactory::class, + ], + ], + + 'middleware_pipeline' => [ + 'always' => [ + 'middleware' => [ + LosMiddleware\BasePath\BasePath::class + ], + ], + ], + +]; diff --git a/deploy.php b/deploy.php index 39295a5..76db542 100644 --- a/deploy.php +++ b/deploy.php @@ -3,16 +3,19 @@ namespace Deployer; require 'recipe/common.php'; // Configuration +set('ssh_type', 'native'); +set('ssh_multiplexing', true); set('repository', 'https://gogs.ragnarok.yvan.hu/TSP/daily-ci-api.git'); set('shared_files', [ 'config/autoload/local.php', 'config/autoload/doctrine.local.php', + 'config/autoload/los-basepath.local.php', // 'config/autoload/errorhandler.local.php', ]); -//set('shared_dirs', [ -// 'data/attachments', -//]); +set('shared_dirs', [ + 'data/persistent', +]); set('writable_dirs', []); set('keep_releases', 3); set('default_stage', 'production'); diff --git a/src/App/Entity/CiConfigItem.php b/src/App/Entity/CiConfigItem.php index d262683..7e90458 100644 --- a/src/App/Entity/CiConfigItem.php +++ b/src/App/Entity/CiConfigItem.php @@ -63,12 +63,24 @@ class CiConfigItem implements JsonSerializable */ private $doRollbackBefore; + /** + * @ORM\Column(name="do_forced_rollback", type="boolean") + * @var bool + */ + private $doForcedRollback; + /** * @ORM\Column(name="do_upgrade", type="boolean") * @var bool */ private $doUpgrade; + /** + * @ORM\Column(name="do_dummy_upgrade", type="boolean") + * @var bool + */ + private $doDummyUpgrade; + /** * @ORM\Column(name="do_lrt", type="boolean") * @var bool @@ -87,12 +99,30 @@ class CiConfigItem implements JsonSerializable */ private $doNmDsv; + /** + * @ORM\Column(name="do_forced_rollback_dummy", type="boolean") + * @var bool + */ + private $doForcedRollbackDummy; + /** * @ORM\Column(name="do_rollback_after", type="boolean") * @var bool */ private $doRollbackAfter; + /** + * @ORM\Column(name="do_nm_char", type="boolean") + * @var bool + */ + private $doNmChar; + + /** + * @ORM\Column(name="do_cw_char", type="boolean") + * @var bool + */ + private $doCwChar; + /** * @ORM\Column(name="do_ssreg_loop", type="boolean") * @var bool @@ -111,6 +141,24 @@ class CiConfigItem implements JsonSerializable */ private $doClusterControlCharacteristicsLoop; + /** + * @ORM\Column(name="do_other_manual", type="boolean") + * @var bool + */ + private $doOtherManual; + + /** + * @ORM\Column(name="do_kickstart", type="boolean") + * @var bool + */ + private $doKickstart; + + /** + * @ORM\Column(name="do_archive_restore", type="boolean") + * @var bool + */ + private $doArchiveRestore; + /** * @ORM\Column(name="tests", type="array", length=65535) * @var string[] @@ -285,6 +333,24 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isDoForcedRollback(): bool + { + return $this->doForcedRollback; + } + + /** + * @param bool $doForcedRollback + * @return CiConfigItem + */ + public function setDoForcedRollback(bool $doForcedRollback): CiConfigItem + { + $this->doForcedRollback = $doForcedRollback; + return $this; + } + /** * @return bool */ @@ -303,6 +369,24 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isDoDummyUpgrade(): bool + { + return $this->doDummyUpgrade; + } + + /** + * @param bool $doDummyUpgrade + * @return CiConfigItem + */ + public function setDoDummyUpgrade(bool $doDummyUpgrade): CiConfigItem + { + $this->doDummyUpgrade = $doDummyUpgrade; + return $this; + } + /** * @return bool */ @@ -357,6 +441,24 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isDoForcedRollbackDummy(): bool + { + return $this->doForcedRollbackDummy; + } + + /** + * @param bool $doForcedRollbackDummy + * @return CiConfigItem + */ + public function setDoForcedRollbackDummy(bool $doForcedRollbackDummy): CiConfigItem + { + $this->doForcedRollbackDummy = $doForcedRollbackDummy; + return $this; + } + /** * @return bool */ @@ -375,6 +477,42 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isDoNmChar(): bool + { + return $this->doNmChar; + } + + /** + * @param bool $doNmChar + * @return CiConfigItem + */ + public function setDoNmChar(bool $doNmChar): CiConfigItem + { + $this->doNmChar = $doNmChar; + return $this; + } + + /** + * @return bool + */ + public function isDoCwChar(): bool + { + return $this->doCwChar; + } + + /** + * @param bool $doCwChar + * @return CiConfigItem + */ + public function setDoCwChar(bool $doCwChar): CiConfigItem + { + $this->doCwChar = $doCwChar; + return $this; + } + /** * @return bool */ @@ -429,6 +567,60 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isDoOtherManual(): bool + { + return $this->doOtherManual; + } + + /** + * @param bool $doOtherManual + * @return CiConfigItem + */ + public function setDoOtherManual(bool $doOtherManual): CiConfigItem + { + $this->doOtherManual = $doOtherManual; + return $this; + } + + /** + * @return bool + */ + public function isDoKickstart(): bool + { + return $this->doKickstart; + } + + /** + * @param bool $doKickstart + * @return CiConfigItem + */ + public function setDoKickstart(bool $doKickstart): CiConfigItem + { + $this->doKickstart = $doKickstart; + return $this; + } + + /** + * @return bool + */ + public function isDoArchiveRestore(): bool + { + return $this->doArchiveRestore; + } + + /** + * @param bool $doArchiveRestore + * @return CiConfigItem + */ + public function setDoArchiveRestore(bool $doArchiveRestore): CiConfigItem + { + $this->doArchiveRestore = $doArchiveRestore; + return $this; + } + /** * @return \string[] */ @@ -513,14 +705,22 @@ class CiConfigItem implements JsonSerializable 'jcat' => $this->getJcat(), 'testType' => $this->getTestType(), 'doRollbackBefore' => $this->isDoRollbackBefore(), + 'doForcedRollback' => $this->isDoForcedRollback(), 'doUpgrade' => $this->isDoUpgrade(), + 'doDummyUpgrade' => $this->isDoDummyUpgrade(), 'doLrt' => $this->isDoLrt(), 'doDsv' => $this->isDoDsv(), 'doNmDsv' => $this->isDoNmDsv(), - 'doRollbackAfter' => $this->isDoRollbackAfter(), + 'doForcedRollbackDummy' => $this->isDoForcedRollbackDummy(), + 'doRollbackAfter' => $this->isDoRollbackAfter(), + 'doNmChar' => $this->isDoNmChar(), + 'doCwChar' => $this->isDoCwChar(), 'doSubsystemRegressionLoop' => $this->isDoSubsystemRegressionLoop(), 'doUpgradeabilityLoop' => $this->isDoUpgradeabilityLoop(), 'doClusterControlCharacteristicsLoop' => $this->isDoClusterControlCharacteristicsLoop(), + 'doOtherManual' => $this->isDoOtherManual(), + 'doKickstart' => $this->isDoKickstart(), + 'doArchiveRestore' => $this->isDoArchiveRestore(), 'nightly' => $this->isNightly(), 'note' => $this->getNote(), 'ran' => $this->isRan(),