Domo Improvements (acquia#438)

* Adding allowed failure * add sheet2 * add sheet2 * revert sheet 1 * add branch * Update script.sh * formatting * Update tests/Console/Command/Ci/CiRunCommandTest.php Co-authored-by: Travis Carden <[email protected]> * adding a last line * Update src/Console/Command/Ci/CiRunCommand.php Co-authored-by: Travis Carden <[email protected]> * move to sheet1 * fix tests * testing * check return values * add debug message * add debug 5 * add trap * missing dollar sign * bash fix * change to SIGINT * new approach * final fix --------- Co-authored-by: Travis Carden <[email protected]>
secretsayan · Nov 28, 2023 · 598ef3c · 598ef3c
1 parent bca6236
commit 598ef3c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 10 deletions.
diff --git a/.idea/orca.iml b/.idea/orca.iml
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
diff --git a/bin/ci/_includes.sh b/bin/ci/_includes.sh
@@ -122,10 +122,17 @@ allowed_failures=(
   "INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER"
 )
 if [[ " ${allowed_failures[*]} " =~ " ${ORCA_JOB} " ]]; then
-  set +e
   export ORCA_IS_ALLOWED_FAILURE="TRUE"
   notice "This job is allowed to fail and will report as passing regardless of outcome."
 fi
 
+function shutdown() {
+    if [[ "$ORCA_IS_ALLOWED_FAILURE" == "TRUE" ]]; then
+        exit 0
+    fi
+}
+
+trap shutdown ERR
+
 # Make the shell print all lines in the script before executing them.
 set -v
diff --git a/bin/ci/script.sh b/bin/ci/script.sh
@@ -11,10 +11,6 @@
 
 cd "$(dirname "$0")" || exit; source _includes.sh
 
-if [[ "$ORCA_JOB" ]]; then
-  eval "orca ci:run $ORCA_JOB script $ORCA_SUT_NAME"
-fi
-
 if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && -d "$ORCA_YARN_DIR" ]]; then
   (
     cd "$ORCA_YARN_DIR" || exit
@@ -34,3 +30,8 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" &&
     kill -0 $CHROMEDRIVER_PID
   )
 fi
+
+if [[ "$ORCA_JOB" ]]; then
+  eval "orca ci:run $ORCA_JOB script $ORCA_SUT_NAME"
+fi
+
diff --git a/src/Console/Command/Ci/CiRunCommand.php b/src/Console/Command/Ci/CiRunCommand.php
@@ -8,6 +8,7 @@
 use Acquia\Orca\Enum\StatusCodeEnum;
 use Acquia\Orca\Event\CiEvent;
 use Acquia\Orca\Exception\OrcaInvalidArgumentException;
+use Acquia\Orca\Helper\EnvFacade;
 use Acquia\Orca\Options\CiRunOptionsFactory;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -46,6 +47,13 @@ class CiRunCommand extends Command {
    */
   private $eventDispatcher;
 
+  /**
+   * The environment facade.
+   *
+   * @var \Acquia\Orca\Helper\EnvFacade
+   */
+  private EnvFacade $env;
+
   /**
    * Constructs an instance.
    *
@@ -55,11 +63,14 @@ class CiRunCommand extends Command {
    *   The CI run options factory.
    * @param \Symfony\Component\EventDispatcher\EventDispatcher $eventDispatcher
    *   The event dispatcher service.
+   * @param \Acquia\Orca\Helper\EnvFacade $env
+   *   The environment facade.
    */
-  public function __construct(CiJobFactory $job_factory, CiRunOptionsFactory $ci_run_options_factory, EventDispatcher $eventDispatcher) {
+  public function __construct(CiJobFactory $job_factory, CiRunOptionsFactory $ci_run_options_factory, EventDispatcher $eventDispatcher, EnvFacade $env) {
     $this->ciJobFactory = $job_factory;
     $this->ciRunOptionsFactory = $ci_run_options_factory;
     $this->eventDispatcher = $eventDispatcher;
+    $this->env = $env;
     parent::__construct(self::$defaultName);
   }
 
@@ -131,6 +142,8 @@ public function execute(InputInterface $input, OutputInterface $output): int {
       $data['status'] = 'FAIL';
       $job = $this->ciJobFactory->create($options->getJob());
       $data['version'] = $job->getDrupalCoreVersion();
+      $data['allowedToFail'] = $this->env->get("ORCA_IS_ALLOWED_FAILURE", FALSE);
+      $data['branch'] = $this->env->get("ORCA_SUT_BRANCH", FALSE);
       $job->run($options);
 
     }

diff --git a/src/Helper/Log/GoogleApiClient.php b/src/Helper/Log/GoogleApiClient.php
@@ -143,6 +143,8 @@ public function postData(array $data): void {
             $data['version'],
             PHP_VERSION,
             $data['status'],
+            $data['allowedToFail'],
+            $data['branch'],
           ],
         ],
       ],

diff --git a/tests/Console/Command/Ci/CiRunCommandTest.php b/tests/Console/Command/Ci/CiRunCommandTest.php
@@ -9,6 +9,7 @@
 use Acquia\Orca\Enum\CiJobPhaseEnum;
 use Acquia\Orca\Enum\StatusCodeEnum;
 use Acquia\Orca\Exception\OrcaInvalidArgumentException;
+use Acquia\Orca\Helper\EnvFacade;
 use Acquia\Orca\Options\CiRunOptions;
 use Acquia\Orca\Options\CiRunOptionsFactory;
 use Acquia\Orca\Tests\Console\Command\CommandTestBase;
@@ -24,6 +25,8 @@
  * @property \Acquia\Orca\Domain\Ci\Job\AbstractCiJob|\Prophecy\Prophecy\ObjectProphecy $ciJob
  * @property \Acquia\Orca\Options\CiRunOptionsFactory|\Prophecy\Prophecy\ObjectProphecy $ciRunOptionsFactory
  * @property \Acquia\Orca\Options\CiRunOptions|\Prophecy\Prophecy\ObjectProphecy $ciRunOptions
+ * @property \Symfony\Component\EventDispatcher\EventDispatcher|\Prophecy\Prophecy\ObjectProphecy $eventDispatcher
+ * @property \Acquia\Orca\Helper\EnvFacade|\Prophecy\Prophecy\ObjectProphecy $env
  * @coversDefaultClass \Acquia\Orca\Console\Command\Ci\CiRunCommand
  */
 class CiRunCommandTest extends CommandTestBase {
@@ -35,6 +38,7 @@ class CiRunCommandTest extends CommandTestBase {
   protected CiRunOptionsFactory|ObjectProphecy $ciRunOptionsFactory;
   protected CiRunOptions|ObjectProphecy $ciRunOptions;
   protected EventDispatcher|ObjectProphecy $eventDispatcher;
+  protected EnvFacade|ObjectProphecy $env;
 
   protected function setUp(): void {
     $this->ciRunOptions = $this->prophesize(CiRunOptions::class);
@@ -54,13 +58,18 @@ protected function setUp(): void {
     $this->eventDispatcher
       ->dispatch(Argument::cetera())
       ->willReturn(new \stdClass());
+    $this->env = $this->prophesize(EnvFacade::class);
+    $this->env
+      ->get(Argument::any(), FALSE)
+      ->willReturn(NULL);
   }
 
   protected function createCommand(): Command {
     $ci_run_options_factory = $this->ciRunOptionsFactory->reveal();
     $ci_job_factory = $this->ciJobFactory->reveal();
     $event_dispatcher = $this->eventDispatcher->reveal();
-    return new CiRunCommand($ci_job_factory, $ci_run_options_factory, $event_dispatcher);
+    $env = $this->env->reveal();
+    return new CiRunCommand($ci_job_factory, $ci_run_options_factory, $event_dispatcher, $env);
   }
 
   private function validSutName(): string {

diff --git a/tests/Helper/Log/GoogleApiClientTest.php b/tests/Helper/Log/GoogleApiClientTest.php
@@ -79,6 +79,8 @@ public function testPostDataWithNullVersion(): void {
       'sut' => 'drupal/example',
       'status' => 'PASS',
       'version' => NULL,
+      'allowedToFail' => TRUE,
+      'branch' => 'main',
     ];
     $this->version
       ->resolvePredefined(Argument::any())
@@ -99,6 +101,8 @@ public function testPostDataWithLatestDrupalVersion(): void {
       'sut' => 'drupal/example',
       'status' => 'PASS',
       'version' => DrupalCoreVersionEnum::CURRENT(),
+      'allowedToFail' => TRUE,
+      'branch' => 'main',
     ];
     $this->version
       ->existsPredefined(Argument::any())