1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 14:00:56 +01:00

Render build status on revisions and commits

Summary:
This uses an event listener to render the status of builds on their buildables.  The revision and commit view now renders out the status of each of the builds.

Currently the revision controller has the results for the latest diff rendered out.  We might want to show the status of previous diffs in the future, but for now I think the latest diff should do fine.

There's also a number of bug fixes in this diff, including a particularly nasty one where builds would have a build plan PHID generated for them, which resulted in handle lookups always returning invalid objects.

Test Plan: Ran builds against diffs and commits, saw them appear on the revision and commit view controllers.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Maniphest Tasks: T1049

Differential Revision: https://secure.phabricator.com/D7544
This commit is contained in:
James Rhodes 2013-11-09 15:02:07 -08:00 committed by epriestley
parent fd8d9ff0d6
commit 79ef667dfd
10 changed files with 154 additions and 29 deletions

View file

@ -700,6 +700,7 @@ phutil_register_library_map(array(
'HarbormasterStepAddController' => 'applications/harbormaster/controller/HarbormasterStepAddController.php',
'HarbormasterStepDeleteController' => 'applications/harbormaster/controller/HarbormasterStepDeleteController.php',
'HarbormasterStepEditController' => 'applications/harbormaster/controller/HarbormasterStepEditController.php',
'HarbormasterUIEventListener' => 'applications/harbormaster/event/HarbormasterUIEventListener.php',
'HeraldAction' => 'applications/herald/storage/HeraldAction.php',
'HeraldAdapter' => 'applications/herald/adapter/HeraldAdapter.php',
'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
@ -3002,6 +3003,7 @@ phutil_register_library_map(array(
'HarbormasterStepAddController' => 'HarbormasterController',
'HarbormasterStepDeleteController' => 'HarbormasterController',
'HarbormasterStepEditController' => 'HarbormasterController',
'HarbormasterUIEventListener' => 'PhabricatorEventListener',
'HeraldAction' => 'HeraldDAO',
'HeraldApplyTranscript' => 'HeraldDAO',
'HeraldCapabilityManageGlobalRules' => 'PhabricatorPolicyCapability',

View file

@ -26,6 +26,12 @@ final class PhabricatorApplicationHarbormaster extends PhabricatorApplication {
return self::GROUP_UTILITIES;
}
public function getEventListeners() {
return array(
new HarbormasterUIEventListener(),
);
}
public function isBeta() {
return true;
}

View file

@ -187,6 +187,21 @@ final class HarbormasterBuildViewController
pht('Status'),
$this->getStatus($build));
$handles = id(new PhabricatorHandleQuery())
->setViewer($viewer)
->withPHIDs(array(
$build->getBuildablePHID(),
$build->getBuildPlanPHID()))
->execute();
$properties->addProperty(
pht('Buildable'),
$handles[$build->getBuildablePHID()]->renderLink());
$properties->addProperty(
pht('Build Plan'),
$handles[$build->getBuildPlanPHID()]->renderLink());
}
private function getStatus(HarbormasterBuild $build) {

View file

@ -28,7 +28,6 @@ final class HarbormasterBuildableViewController
$builds = id(new HarbormasterBuildQuery())
->setViewer($viewer)
->withBuildablePHIDs(array($buildable->getPHID()))
->needBuildPlans(true)
->execute();
$build_list = id(new PHUIObjectItemListView())

View file

@ -0,0 +1,106 @@
<?php
final class HarbormasterUIEventListener
extends PhabricatorEventListener {
public function register() {
$this->listen(PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES);
}
public function handleEvent(PhutilEvent $event) {
switch ($event->getType()) {
case PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES:
$this->handlePropertyEvent($event);
break;
}
}
private function handlePropertyEvent($ui_event) {
$user = $ui_event->getUser();
$object = $ui_event->getValue('object');
if (!$object || !$object->getPHID()) {
// No object, or the object has no PHID yet..
return;
}
$target = null;
if ($object instanceof PhabricatorRepositoryCommit) {
$target = $object;
} elseif ($object instanceof DifferentialRevision) {
$target = $object->loadActiveDiff();
} else {
return;
}
if (!$this->canUseApplication($ui_event->getUser())) {
return;
}
$buildables = id(new HarbormasterBuildableQuery())
->setViewer($user)
->withBuildablePHIDs(array($target->getPHID()))
->execute();
if (!$buildables) {
return;
}
$builds = id(new HarbormasterBuildQuery())
->setViewer($user)
->withBuildablePHIDs(mpull($buildables, 'getPHID'))
->execute();
if (!$builds) {
return;
}
$build_handles = id(new PhabricatorHandleQuery())
->setViewer($user)
->withPHIDs(mpull($builds, 'getPHID'))
->execute();
$status_view = new PHUIStatusListView();
foreach ($builds as $build) {
$item = new PHUIStatusItemView();
$item->setTarget(
$build_handles[$build->getPHID()]->renderLink());
switch ($build->getBuildStatus()) {
case HarbormasterBuild::STATUS_INACTIVE:
$item->setIcon('open-dark', pht('Inactive'));
break;
case HarbormasterBuild::STATUS_PENDING:
$item->setIcon('open-blue', pht('Pending'));
break;
case HarbormasterBuild::STATUS_WAITING:
$item->setIcon('up-blue', pht('Waiting on Resource'));
break;
case HarbormasterBuild::STATUS_BUILDING:
$item->setIcon('right-blue', pht('Building'));
break;
case HarbormasterBuild::STATUS_PASSED:
$item->setIcon('accept-green', pht('Passed'));
break;
case HarbormasterBuild::STATUS_FAILED:
$item->setIcon('reject-red', pht('Failed'));
break;
case HarbormasterBuild::STATUS_ERROR:
$item->setIcon('minus-red', pht('Unexpected Error'));
break;
case HarbormasterBuild::STATUS_CANCELLED:
$item->setIcon('minus-dark', pht('Cancelled'));
break;
default:
$item->setIcon('question', pht('Unknown'));
break;
}
$status_view->addItem($item);
}
$view = $ui_event->getValue('view');
$view->addProperty(pht('Build Status'), $status_view);
}
}

View file

@ -30,7 +30,13 @@ final class HarbormasterPHIDTypeBuild extends PhabricatorPHIDType {
array $objects) {
foreach ($handles as $phid => $handle) {
$build_plan = $objects[$phid];
$build = $objects[$phid];
$handles[$phid]->setName(pht(
'Build %d: %s',
$build->getID(),
$build->getName()));
$handles[$phid]->setURI(
'/harbormaster/build/'.$build->getID());
}
}

View file

@ -9,8 +9,6 @@ final class HarbormasterBuildQuery
private $buildablePHIDs;
private $buildPlanPHIDs;
private $needBuildPlans;
public function withIDs(array $ids) {
$this->ids = $ids;
return $this;
@ -36,11 +34,6 @@ final class HarbormasterBuildQuery
return $this;
}
public function needBuildPlans($need_plans) {
$this->needBuildPlans = $need_plans;
return $this;
}
protected function loadPage() {
$table = new HarbormasterBuild();
$conn_r = $table->establishConnection('r');
@ -82,7 +75,6 @@ final class HarbormasterBuildQuery
}
protected function didFilterPage(array $page) {
if ($this->needBuildPlans) {
$plans = array();
$plan_phids = array_filter(mpull($page, 'getBuildPlanPHID'));
@ -99,7 +91,6 @@ final class HarbormasterBuildQuery
$plan_phid = $build->getBuildPlanPHID();
$build->attachBuildPlan(idx($plans, $plan_phid));
}
}
return $page;
}

View file

@ -16,9 +16,10 @@ abstract class VariableBuildStepImplementation extends BuildStepImplementation {
$object = $buildable->getBuildableObject();
$repo = null;
if ($object instanceof DifferentialRevision) {
$results['buildable.revision'] = $object->getID();
$repo = $object->getRepository();
if ($object instanceof DifferentialDiff) {
$revision = $object->getRevision();
$results['buildable.revision'] = $revision->getID();
$repo = $revision->getRepository();
} else if ($object instanceof PhabricatorRepositoryCommit) {
$results['buildable.commit'] = $object->getCommitIdentifier();
$repo = $object->getRepository();

View file

@ -65,7 +65,7 @@ final class HarbormasterBuild extends HarbormasterDAO
public function generatePHID() {
return PhabricatorPHID::generateNewPHID(
HarbormasterPHIDTypeBuildPlan::TYPECONST);
HarbormasterPHIDTypeBuild::TYPECONST);
}
public function attachBuildable(HarbormasterBuildable $buildable) {

View file

@ -18,7 +18,6 @@ final class HarbormasterBuildWorker extends PhabricatorWorker {
->setViewer(PhabricatorUser::getOmnipotentUser())
->withBuildStatuses(array(HarbormasterBuild::STATUS_PENDING))
->withIDs(array($id))
->needBuildPlans(true)
->executeOne();
if (!$build) {
throw new PhabricatorWorkerPermanentFailureException(