fix wait log

nginx · Aug 7, 2024 · 397ee98 · 397ee98
1 parent 3df74ab
commit 397ee98
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -188,14 +188,18 @@ jobs:
       fail-fast: false
       matrix:
         container:
-        - image: "debian"
+        - image: "bookworm"
           version: "stable"
-        - image: "debian"
+          release: "debian"
+        - image: "bookworm"
           version: "mainline"
+          release: "debian"
         - image: "alpine"
           version: "stable"
+          release: "alpine"
         - image: "alpine"
           version: "mainline"
+          release: "alpine"
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
@@ -217,7 +221,7 @@ jobs:
       - name: Run Integration Tests
         run: |
           go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
-          CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" TAG="${{ matrix.container.version }}-${{ matrix.container.image }}"\
+          CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" TAG="${{ matrix.container.version }}-${{ matrix.container.image }}" OS_RELEASE="${{ matrix.container.release }}"\
             make new-integration-test
       - name: Container Output Logs 
         if: failure()

diff --git a/test/integration/api/docker-compose-rpm.yml b/test/integration/api/docker-compose-rpm.yml
@@ -14,6 +14,8 @@ services:
         PACKAGE_NAME: ${PACKAGE_NAME}
         PACKAGES_REPO: ${PACKAGES_REPO}
         BASE_IMAGE: ${BASE_IMAGE}
+        OS_RELEASE: ${OS_RELEASE}
+        OS_VERSION: ${OS_VERSION}
         ENTRY_POINT: "./scripts/docker/entrypoint.sh"
     ports:
       - 9091:9091

diff --git a/test/integration/utils/test_container_utils.go b/test/integration/utils/test_container_utils.go
@@ -92,7 +92,7 @@ func SetupTestContainerWithoutAgent(t *testing.T) *testcontainers.DockerContaine
 			"CONTAINER_OS_TYPE":              os.Getenv("CONTAINER_OS_TYPE"),
 			"IMAGE_PATH":                     os.Getenv("IMAGE_PATH"),
 		}).
-		WaitForService("agent", wait.NewLogStrategy("'nginx' with pid").WithOccurrence(1)).
+		WaitForService("agent", wait.NewLogStrategy("nginx_pid").WithOccurrence(1)).
 		Up(ctx, compose.Wait(true))
 
 	assert.NoError(t, err, "compose.Up()")