From a02d61e6c72ec5ded7eea907dd280bb9c0ceeb95 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Fri, 26 Jun 2026 12:27:49 +0200 Subject: [PATCH 1/4] fix(tests): use regexes for better exclusions The images we use from RHCOS may change from underneatch our feet, so we use regexes to exclude broader patterns that we know won't work with fact. --- .github/workflows/integration-tests.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 79e8e306..f0f51ad2 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -40,7 +40,7 @@ jobs: with: repository: stackrox/collector path: collector - ref: master + ref: mauro/ansible/exclude-by-regex - uses: actions/setup-python@v5 with: python-version: "3.10" @@ -88,14 +88,11 @@ jobs: # RHEL 8 doesn't handle file creation properly, # need more investigation - rhel-8 - - rhcos-412-86-202402272018-0-gcp-x86-64 - - rhcos-414-92-202407091253-0-gcp-x86-64 + - rhcos-4[-0-9]+-gcp-x86-64 # BPF trampolines are only implemented starting with RHEL 10 - rhel-9-arm64 - - rhcos-9-8-20260520-0-gcp-aarch64 - - rhcos-9-6-20260512-0-gcp-aarch64 - - rhcos-418-94-202602022246-0-gcp-aarch64 - - rhcos-416-94-202510081640-0-gcp-aarch64 + - rhcos-9-[-0-9]+-gcp-aarch64 + - rhcos-4[-0-9]+-gcp-aarch64 EOF - name: Create Test VMs From d24b615585fdbce758414aa73fab76129e259b62 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Fri, 26 Jun 2026 12:47:47 +0200 Subject: [PATCH 2/4] fix: reinclude 4.16+ rhcos VMs --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index f0f51ad2..83d9d265 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -88,7 +88,7 @@ jobs: # RHEL 8 doesn't handle file creation properly, # need more investigation - rhel-8 - - rhcos-4[-0-9]+-gcp-x86-64 + - rhcos-41[0-4]-[-0-9]+-gcp-x86-64 # BPF trampolines are only implemented starting with RHEL 10 - rhel-9-arm64 - rhcos-9-[-0-9]+-gcp-aarch64 From 39576c27282a0f1c1b2347b1c882ef52b290da7e Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Fri, 26 Jun 2026 13:04:16 +0200 Subject: [PATCH 3/4] Use excluded_images --- .github/workflows/integration-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 83d9d265..ca86aaae 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -88,9 +88,13 @@ jobs: # RHEL 8 doesn't handle file creation properly, # need more investigation - rhel-8 - - rhcos-41[0-4]-[-0-9]+-gcp-x86-64 # BPF trampolines are only implemented starting with RHEL 10 - rhel-9-arm64 + excluded_images: + # RHEL 8 doesn't handle file creation properly, + # need more investigation + - rhcos-41[0-4]-[-0-9]+-gcp-x86-64 + # BPF trampolines are only implemented starting with RHEL 10 - rhcos-9-[-0-9]+-gcp-aarch64 - rhcos-4[-0-9]+-gcp-aarch64 EOF From 46ca813cc57fe6080dfa876b76702f7490c124bd Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Mon, 29 Jun 2026 12:54:31 +0200 Subject: [PATCH 4/4] Rollback to collector master branch --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index ca86aaae..20002076 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -40,7 +40,7 @@ jobs: with: repository: stackrox/collector path: collector - ref: mauro/ansible/exclude-by-regex + ref: master - uses: actions/setup-python@v5 with: python-version: "3.10"