diff --git a/arcanist_util/config/FacebookArcanistConfiguration.php b/arcanist_util/config/FacebookArcanistConfiguration.php index 5266eea55..4e936ce7e 100644 --- a/arcanist_util/config/FacebookArcanistConfiguration.php +++ b/arcanist_util/config/FacebookArcanistConfiguration.php @@ -10,7 +10,6 @@ class FacebookArcanistConfiguration extends ArcanistConfiguration { ArcanistBaseWorkflow $workflow, $error_code) { if ($command == 'diff' && !$workflow->isRawDiffSource()) { - $this->startTestsInJenkins($workflow); $this->startTestsInSandcastle($workflow); } } @@ -72,7 +71,7 @@ class FacebookArcanistConfiguration extends ArcanistConfiguration { $patch = array( "name" => "Patch " . $diffID, "shell" => "HTTPS_PROXY=fwdproxy:8080 arc --arcrc-file ~/.arcrc " - . "patch --diff " . $diffID, + . "patch --nocommit --diff " . $diffID, "user" => "root" ); @@ -185,22 +184,4 @@ class FacebookArcanistConfiguration extends ArcanistConfiguration { // Ask phabricator to display it on the diff UI $this->postURL($diffID, $sandcastle_url[1]); } - - ////////////////////////////////////////////////////////////////////// - /* Send off builds to jenkins */ - function startTestsInJenkins($workflow) { - $diffID = $workflow->getDiffID(); - if ($diffID === null) { - return; - } - - $results = $workflow->getTestResults(); - if (!$results) { - return; - } - - $url = "https://ci-builds.fb.com/view/rocksdb/job/rocksdb_diff_check/" - ."buildWithParameters?token=AUTH&DIFF_ID=$diffID"; - system("curl --noproxy '*' \"$url\" > /dev/null 2>&1"); - } } diff --git a/arcanist_util/unit_engine/FacebookFbcodeUnitTestEngine.php b/arcanist_util/unit_engine/FacebookFbcodeUnitTestEngine.php index f9a9e70e5..985bd68fc 100644 --- a/arcanist_util/unit_engine/FacebookFbcodeUnitTestEngine.php +++ b/arcanist_util/unit_engine/FacebookFbcodeUnitTestEngine.php @@ -7,15 +7,11 @@ class FacebookFbcodeUnitTestEngine extends ArcanistBaseUnitTestEngine { public function run() { - // Here we create a new unit test "jenkins_async_test" and promise we'll - // update the results later. - // Jenkins updates the results using `arc call-conduit - // differential.updateunitresults` call. If you change the name here, also - // make sure to change the name in Jenkins script that updates the test - // result -- they have to be the same. - $result = new ArcanistUnitTestResult(); - $result->setName("jenkins_async_test"); - $result->setResult(ArcanistUnitTestResult::RESULT_POSTPONED); - return array($result); + // For a call to `arc call-conduit differential.updateunitresults` to + // succeed we need at least one entry here. + $result = new ArcanistUnitTestResult(); + $result->setName("dummy_placeholder_entry"); + $result->setResult(ArcanistUnitTestResult::RESULT_PASS); + return array($result); } }