fixing e2e tests

Signed-off-by: Matt Wrock <matt@mattwrock.com>

Author: mwrock

.expeditor/end_to_end.pipeline.yml

@@ -746,18 +746,6 @@ steps:
           environment:
             - BUILD_PKG_TARGET=x86_64-linux
 
-  - label: "[:linux: test service PID files with old Launcher]"
-    command:
-      - bash .expeditor/scripts/end_to_end/run_e2e_test.sh dev test_service_pids_written_to_file_using_old_launcher
-    artifact_paths:
-      - "*.log"
-    expeditor:
-      executor:
-        docker:
-          privileged: true
-          environment:
-            - BUILD_PKG_TARGET=x86_64-linux
-
   - label: "[:linux: test_event_stream]"
     command:
       - bash .expeditor/scripts/end_to_end/run_e2e_test.sh dev test_event_stream

test/end-to-end/test_container_exporter.ps1

@@ -149,6 +149,9 @@ Describe "hab pkg export container --multi-layer" {
 if ($IsLinux) {
     # TODO: Try to run the container when we have a core/podman package
     Describe "hab pkg export container --engine=buildah" {
+        hab pkg install core/buildah --binlink --channel=base
+        hab pkg install core/netavark --binlink --channel=base
+        $env:CONTAINERS_HELPER_BINARY_DIR="$(hab pkg path core/netavark)/bin"
         It "Runs successfully" {
             $tag = New-CustomTag
             Invoke-NativeCommand hab pkg export container --base-pkgs-channel=$env:HAB_BLDR_CHANNEL core/nginx --engine=buildah --tag-custom="$tag"

test/end-to-end/test_service_pids_come_from_new_launcher.ps1

@@ -3,7 +3,7 @@
 
 Describe "Service PIDs from Launcher feature" {
     $supLog = New-SupervisorLogFile("service_pids_come_from_launcher_feature")
-    Start-Supervisor -LogFile $supLog -Timeout 20
+    Start-Supervisor -LogFile $supLog -Timeout 45
 
     Load-SupervisorService -PackageName "core/redis"
     Wait-ProcessStart redis-server -Timeout 10