Merge pull request #7934 from habitat-sh/dmcneil/e2e

Fix e2e tests
habitat-sh · Sep 29, 2020 · cae2528 · cae2528
2 parents b74a05d + b8241a7
commit cae2528
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.expeditor/end_to_end.pipeline.yml b/.expeditor/end_to_end.pipeline.yml
@@ -887,7 +887,7 @@ steps:
       automatic:
         limit: 1
 
-  - label: "[:linux: test_external_binaries]"
+  - label: "[:linux: test_cli_config_file]"
     command:
       - bash .expeditor/scripts/end_to_end/run_e2e_test.sh dev test_cli_config_file
     env:

diff --git a/.expeditor/scripts/end_to_end/run_e2e_test_core.ps1 b/.expeditor/scripts/end_to_end/run_e2e_test_core.ps1
@@ -174,7 +174,7 @@ function Wait-SupervisorServiceUnload($ServiceName, $Timeout = 1) {
     Write-Host "$ServiceName is now unloaded."
 }
 
-function Unload-SupervisorService($PackageName, $Timeout = 1) {
+function Unload-SupervisorService($PackageName, $Timeout = 5) {
     $svcName = ($PackageName -split "/")[1]
     $_ = Invoke-NativeCommand hab svc unload $PackageName
     Wait-SupervisorServiceUnload $svcName -Timeout $Timeout