fix integration test failures (#396)

* fix integration test
nginx · Jul 21, 2023 · c945263 · c945263
1 parent 2f22eb8
commit c945263
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,27 +114,34 @@ jobs:
           go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
           OS_RELEASE="${{ matrix.container.image }}" OS_VERSION="${{ matrix.container.version }}" \
             make integration-test
+      - name: Output Logs 
+        if: failure()
+        run: |
+          docker ps -a
+          dockerid=$(docker ps -a --format "{{.ID}}")
+          docker logs "$dockerid"
+
       - name: Archive install/uninstall integration test logs
+        if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
           name: integration-test-log-${{ matrix.container.image }}-${{ matrix.container.version }}
           path: /tmp/nginx-agent-integration-test-install-uninstall.log
           retention-days: 3
-        if: success() || failure()
       - name: Archive api integration test logs
+        if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
           name: integration-test-log-${{ matrix.container.image }}-${{ matrix.container.version }}
           path: /tmp/nginx-agent-integration-test-api.log
           retention-days: 3
-        if: success() || failure()
       - name: Archive features integration test logs
+        if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
-          name: features-test-log-${{ matrix.container.image }}-${{ matrix.container.version }}
+          name: integration-test-log-${{ matrix.container.image }}-${{ matrix.container.version }}
           path: /tmp/nginx-agent-integration-test-features.log
           retention-days: 3
-        if: success() || failure()
 
   performance-test:
     name: Performance Tests

diff --git a/scripts/docker/agentless-entrypoint.sh b/scripts/docker/agentless-entrypoint.sh
@@ -13,15 +13,12 @@ trap 'handle_term' TERM
 
 # Launch nginx
 echo "starting nginx ..."
-nginx -g "daemon off;" &
+/usr/sbin/nginx -g "daemon off;" &
 
 nginx_pid=$!
 
 wait_term()
 {
-    trap - TERM
-    kill -QUIT "${nginx_pid}" 2>/dev/null
-    echo "waiting for nginx to stop..."
     wait ${nginx_pid}
 }
 

diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh
@@ -35,9 +35,6 @@ fi
 wait_term()
 {
     wait ${agent_pid}
-    trap - TERM
-    kill -QUIT "${nginx_pid}" 2>/dev/null
-    echo "waiting for nginx to stop..."
     wait ${nginx_pid}
 }
 

diff --git a/test/integration/utils/test_container_utils.go b/test/integration/utils/test_container_utils.go
@@ -62,27 +62,31 @@ func SetupTestContainerWithoutAgent(t *testing.T) *testcontainers.DockerContaine
 	comp, err := compose.NewDockerCompose(os.Getenv("DOCKER_COMPOSE_FILE"))
 	assert.NoError(t, err, "NewDockerComposeAPI()")
 
-	ctx := context.Background()
-
-	ctxCancel, cancel := context.WithCancel(ctx)
+	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
-	assert.NoError(t, comp.WaitForService("agent", wait.ForHTTP("/").WithStartupTimeout(agentServiceTimeout)).WithEnv(
-		map[string]string{
+	err = comp.
+		WithEnv(map[string]string{
 			"PACKAGE_NAME":      os.Getenv("PACKAGE_NAME"),
 			"PACKAGES_REPO":     os.Getenv("PACKAGES_REPO"),
 			"INSTALL_FROM_REPO": os.Getenv("INSTALL_FROM_REPO"),
 			"BASE_IMAGE":        os.Getenv("BASE_IMAGE"),
 			"OS_RELEASE":        os.Getenv("OS_RELEASE"),
 			"OS_VERSION":        os.Getenv("OS_VERSION"),
-		},
-	).Up(ctxCancel, compose.Wait(true)), "compose.Up()")
+		}).
+		WaitForService("agent", wait.NewLogStrategy("nginx_pid").WithOccurrence(1)).
+		Up(ctx, compose.Wait(true))
 
-	testContainer, err := comp.ServiceContainer(ctxCancel, "agent")
-	require.NoError(t, err)
+	assert.NoError(t, err, "compose.Up()")
+
+	testContainer, err := comp.ServiceContainer(ctx, "agent")
+	serviceNames := comp.Services()
+
+	assert.Equal(t, 1, len(serviceNames))
+	assert.Contains(t, serviceNames, "agent")
 
 	t.Cleanup(func() {
-		logReader, err := testContainer.Logs(ctxCancel)
+		logReader, err := testContainer.Logs(ctx)
 		assert.NoError(t, err)
 		defer logReader.Close()
 
@@ -92,7 +96,7 @@ func SetupTestContainerWithoutAgent(t *testing.T) *testcontainers.DockerContaine
 		err = os.WriteFile("/tmp/nginx-agent-integration-test-install-uninstall.log", testContainerLogs, 0o660)
 		assert.NoError(t, err)
 
-		assert.NoError(t, comp.Down(ctxCancel, compose.RemoveOrphans(true), compose.RemoveImagesLocal), "compose.Down()")
+		assert.NoError(t, comp.Down(ctx, compose.RemoveOrphans(true), compose.RemoveImagesLocal), "compose.Down()")
 	})
 
 	return testContainer