Skip to content

Commit 229cd7d

Browse files
committed
feat(ci): run integration tests with otel output
Since the grpc output already tests all kernels we support, these tests are only run on fedora-coreos.
1 parent f50505e commit 229cd7d

4 files changed

Lines changed: 29 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,18 @@ jobs:
149149
uses: ./.github/workflows/integration-tests.yml
150150
with:
151151
tag: ${{ needs.container-build.outputs.tag }}
152+
vms: '["fedora-coreos", "fcarm", "rhel", "rhel-arm64", "rhcos", "rhcos-arm64"]'
153+
secrets: inherit
154+
155+
integration-tests-otel:
156+
needs:
157+
- container-build-otel
158+
uses: ./.github/workflows/integration-tests.yml
159+
with:
160+
tag: ${{ needs.container-build-otel.outputs.tag }}
161+
job-tag: otel
162+
vms: '["fedora-coreos"]'
163+
output-type: otlp
152164
secrets: inherit
153165

154166
performance-tests:
@@ -158,4 +170,5 @@ jobs:
158170
uses: ./.github/workflows/integration-tests.yml
159171
with:
160172
tag: ${{ needs.container-build.outputs.tag }}
173+
vms: '["fedora-coreos", "fcarm", "rhel", "rhel-arm64", "rhcos", "rhcos-arm64"]'
161174
secrets: inherit

.github/workflows/integration-tests.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,23 @@ on:
1717
description: Additional tag to prevent collision on GCP VM naming
1818
type: string
1919
default: ''
20+
vms:
21+
description: JSON encoded list of vms to run tests on
22+
type: string
23+
required: true
24+
output-type:
25+
description: The output type to be used in the tests
26+
type: string
27+
required: false
28+
default: grpc
2029

2130
jobs:
2231
integration-tests:
2332
runs-on: ubuntu-24.04
2433
strategy:
2534
fail-fast: false
2635
matrix:
27-
vm:
28-
- fedora-coreos
29-
- fcarm
30-
- rhel
31-
- rhel-arm64
32-
- rhcos
33-
- rhcos-arm64
36+
vm: ${{ fromJson(inputs.vms) }}
3437

3538
steps:
3639
- uses: actions/checkout@v4
@@ -73,6 +76,7 @@ jobs:
7376
FACT_VERSION: ${{ inputs.version }}
7477
FACT_REGISTRY: ${{ inputs.registry }}
7578
FACT_TAG: ${{ inputs.tag }}
79+
OUTPUT_TYPE: ${{ inputs.output-type }}
7680
run: |
7781
FACT_IMAGE_NAME="$(make -sC "${GITHUB_WORKSPACE}/fact" image-name)"
7882
cat << EOF > vars.yml
@@ -81,6 +85,7 @@ jobs:
8185
fact:
8286
image: ${FACT_IMAGE_NAME}
8387
version: ${FACT_VERSION}
88+
output_type: ${OUTPUT_TYPE}
8489
quay:
8590
username: ${{ secrets.QUAY_RHACS_ENG_RO_USERNAME }}
8691
password: ${{ secrets.QUAY_RHACS_ENG_RO_PASSWORD }}

.github/workflows/konflux-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ jobs:
5050
registry: quay.io/rhacs-eng/release-fact
5151
tag: ${{ needs.init.outputs.fact-tag }}
5252
job-tag: konf
53+
vms: '["fedora-coreos", "fcarm", "rhel", "rhel-arm64", "rhcos", "rhcos-arm64"]'
5354
secrets: inherit

ansible/run-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
- name: Run integration tests
33
hosts: "platform_*:&job_id_{{ job_id }}"
4-
environment:
5-
FACT_IMAGE_NAME: "{{ fact.image | default(None) }}"
64

75
tasks:
86
- name: Clone the repo
@@ -44,6 +42,8 @@
4442
become: true
4543
environment:
4644
DOCKER_HOST: "{{ runtime_host }}"
45+
FACT_IMAGE_NAME: "{{ fact.image | default(None) }}"
46+
OUTPUT_TYPE: "{{ output_type | default('grpc') }}"
4747
ansible.builtin.shell:
4848
cmd: |
4949
set -euo pipefail
@@ -65,7 +65,7 @@
6565
../third_party/stackrox/proto/internalapi/sensor/sfa_iservice.proto
6666
6767
# Run the tests
68-
pytest --image="${FACT_IMAGE_NAME}" --junit-xml=results.xml
68+
pytest --image="${FACT_IMAGE_NAME}" --junit-xml=results.xml --output="${OUTPUT_TYPE}"
6969
7070
always:
7171
- name: Make logs directories

0 commit comments

Comments
 (0)