MAGECLOUD-2711: Cron kill during redeploy doesn't work (#352)

* MAGECLOUD-2711: Cron kill during redeploy doesn't work
 - change $UID to $USER

* MAGECLOUD-2711: Cron kill during redeploy doesn't work

Author: NadiyaS

src/Process/Deploy/CronProcessKill.php

@@ -46,7 +46,7 @@ public function execute()
         try {
             $this->logger->info('Trying to kill running cron jobs');
 
-            $cronPids = $this->shell->execute('exec pgrep -U "$UID" -f "bin/magento cron:run"');
+            $cronPids = $this->shell->execute('exec pgrep -U "$(id -u)" -f "bin/magento cron:run"');
             foreach ($cronPids as $pid) {
                 $this->killProcess($pid);
             }

src/Test/Unit/Process/Deploy/CronProcessKillTest.php

@@ -54,7 +54,7 @@ public function testExecute()
             ->method('execute')
             ->willReturnMap(
                 [
-                    ['exec pgrep -U "$UID" -f "bin/magento cron:run"', [], [111, 222]],
+                    ['exec pgrep -U "$(id -u)" -f "bin/magento cron:run"', [], [111, 222]],
                     ["kill 111", [], []],
                     ["kill 222", [], []],
                 ]
@@ -75,7 +75,7 @@ public function testExecuteWithNoRunningCrons()
             );
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with('exec pgrep -U "$UID" -f "bin/magento cron:run"')
+            ->with('exec pgrep -U "$(id -u)" -f "bin/magento cron:run"')
             ->willThrowException(new \RuntimeException('return code 1', 1));
         $this->process->execute();
     }
@@ -90,7 +90,7 @@ public function testExecuteWithError()
             ->with('Trying to kill running cron jobs');
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with('exec pgrep -U "$UID" -f "bin/magento cron:run"')
+            ->with('exec pgrep -U "$(id -u)" -f "bin/magento cron:run"')
             ->willThrowException(new \RuntimeException('return code 2', 2));
         $this->loggerMock->expects($this->once())
             ->method('warning')
@@ -114,7 +114,7 @@ public function testExecuteWithExeption()
             );
         $this->shellMock->expects($this->at(0))
             ->method('execute')
-            ->with('exec pgrep -U "$UID" -f "bin/magento cron:run"')
+            ->with('exec pgrep -U "$(id -u)" -f "bin/magento cron:run"')
             ->willReturn([111, 222]);
         $this->shellMock->expects($this->at(1))
             ->method('execute')