diff --git a/deploy.php b/deploy.php index 76db542..d0fac55 100644 --- a/deploy.php +++ b/deploy.php @@ -20,24 +20,24 @@ set('writable_dirs', []); set('keep_releases', 3); set('default_stage', 'production'); -// Servers +// Servers server('vasgyuro', 'vasgyuro.tsp') ->stage('production') ->user('edvidan') ->forwardAgent() -// ->set('php_service_name', 'php7.1-fpm') + ->set('php_service_name', 'php7.1-fpm') ->set('deploy_path', '/home/edvidan/applications/daily-ci-api'); -/* -desc('Restart PHP-FPM service'); -task('php-fpm:restart', function () { + +desc('Reload PHP-FPM service'); +task('php-fpm:reload', function () { // The user must have rights for restart service // /etc/sudoers: username ALL=NOPASSWD:/bin/systemctl restart php-fpm.service run('sudo service {{php_service_name}} reload'); -})->onlyOn('alfheim'); -after('deploy:symlink', 'php-fpm:restart'); -*/ +}); //->onlyOn('alfheim'); +after('deploy:symlink', 'php-fpm:reload'); + desc('Deploy your project'); task('deploy', [ diff --git a/src/App/Entity/CiConfigItem.php b/src/App/Entity/CiConfigItem.php index 7e90458..1dfae02 100644 --- a/src/App/Entity/CiConfigItem.php +++ b/src/App/Entity/CiConfigItem.php @@ -61,103 +61,109 @@ class CiConfigItem implements JsonSerializable * @ORM\Column(name="do_rollback_before", type="boolean") * @var bool */ - private $doRollbackBefore; + private $doRollbackBefore = true; /** * @ORM\Column(name="do_forced_rollback", type="boolean") * @var bool */ - private $doForcedRollback; + private $doForcedRollback = false; /** * @ORM\Column(name="do_upgrade", type="boolean") * @var bool */ - private $doUpgrade; + private $doUpgrade = true; /** * @ORM\Column(name="do_dummy_upgrade", type="boolean") * @var bool */ - private $doDummyUpgrade; + private $doDummyUpgrade = false; /** * @ORM\Column(name="do_lrt", type="boolean") * @var bool */ - private $doLrt; + private $doLrt = true; /** * @ORM\Column(name="do_dsv", type="boolean") * @var bool */ - private $doDsv; + private $doDsv = true; /** * @ORM\Column(name="do_nmdsv", type="boolean") * @var bool */ - private $doNmDsv; + private $doNmDsv = false; /** * @ORM\Column(name="do_forced_rollback_dummy", type="boolean") * @var bool */ - private $doForcedRollbackDummy; + private $doForcedRollbackDummy = false; /** * @ORM\Column(name="do_rollback_after", type="boolean") * @var bool */ - private $doRollbackAfter; + private $doRollbackAfter = true; + + /** + * @ORM\Column(name="do_vip_char", type="boolean") + * @var bool + */ + private $doVipChar = false; /** * @ORM\Column(name="do_nm_char", type="boolean") * @var bool */ - private $doNmChar; + private $doNmChar = false; /** * @ORM\Column(name="do_cw_char", type="boolean") * @var bool */ - private $doCwChar; + private $doCwChar = false; /** * @ORM\Column(name="do_ssreg_loop", type="boolean") * @var bool */ - private $doSubsystemRegressionLoop; + private $doSubsystemRegressionLoop = false; /** * @ORM\Column(name="do_upgr_loop", type="boolean") * @var bool */ - private $doUpgradeabilityLoop; + private $doUpgradeabilityLoop = false; /** * @ORM\Column(name="do_cc_char_loop", type="boolean") * @var bool */ - private $doClusterControlCharacteristicsLoop; + private $doClusterControlCharacteristicsLoop = false; /** * @ORM\Column(name="do_other_manual", type="boolean") * @var bool */ - private $doOtherManual; + private $doOtherManual = false; /** * @ORM\Column(name="do_kickstart", type="boolean") * @var bool */ - private $doKickstart; + private $doKickstart = false; /** * @ORM\Column(name="do_archive_restore", type="boolean") * @var bool */ - private $doArchiveRestore; + private $doArchiveRestore = false; /** * @ORM\Column(name="tests", type="array", length=65535) @@ -183,6 +189,12 @@ class CiConfigItem implements JsonSerializable */ private $ran = false; + /** + * @ORM\Column(name="can_autostart", type="boolean") + * @var bool + */ + private $canAutostart = false; + /** * @return mixed */ @@ -477,6 +489,24 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isDoVipChar(): bool + { + return $this->doVipChar; + } + + /** + * @param bool $doVipChar + * @return CiConfigItem + */ + public function setDoVipChar(bool $doVipChar): CiConfigItem + { + $this->doVipChar = $doVipChar; + return $this; + } + /** * @return bool */ @@ -693,6 +723,24 @@ class CiConfigItem implements JsonSerializable return $this; } + /** + * @return bool + */ + public function isCanAutostart(): bool + { + return $this->canAutostart; + } + + /** + * @param bool $canAutostart + * @return CiConfigItem + */ + public function setCanAutostart(bool $canAutostart): CiConfigItem + { + $this->canAutostart = $canAutostart; + return $this; + } + /** * @return array */ @@ -713,6 +761,7 @@ class CiConfigItem implements JsonSerializable 'doNmDsv' => $this->isDoNmDsv(), 'doForcedRollbackDummy' => $this->isDoForcedRollbackDummy(), 'doRollbackAfter' => $this->isDoRollbackAfter(), + 'doVipChar' => $this->isDoVipChar(), 'doNmChar' => $this->isDoNmChar(), 'doCwChar' => $this->isDoCwChar(), 'doSubsystemRegressionLoop' => $this->isDoSubsystemRegressionLoop(), @@ -724,6 +773,7 @@ class CiConfigItem implements JsonSerializable 'nightly' => $this->isNightly(), 'note' => $this->getNote(), 'ran' => $this->isRan(), + 'canAutostart' => $this->isCanAutostart(), ]; } }