Skip to content

Commit ee9b8d6

Browse files
committed
ci changes
1 parent c71d822 commit ee9b8d6

4 files changed

Lines changed: 72 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
-DENABLE_SFTP=ON
5353
-DENABLE_SPLUNK=ON
5454
-DENABLE_SQL=ON
55+
-DMINIFI_RUST=ON
5556
-DENABLE_TEST_PROCESSORS=OFF
5657
-DFORCE_COLORED_OUTPUT=OFF
5758
-DLIBC_STATIC=OFF
@@ -161,6 +162,7 @@ jobs:
161162
-DENABLE_SQL=ON
162163
-DENABLE_TEST_PROCESSORS=OFF
163164
-DENABLE_WEL=ON
165+
-DMINIFI_RUST=ON
164166
-DFORCE_COLORED_OUTPUT=ON
165167
-DINSTALLER_MERGE_MODULES=OFF
166168
-DMINIFI_FAIL_ON_WARNINGS=ON
@@ -261,6 +263,7 @@ jobs:
261263
-DENABLE_SPLUNK=ON
262264
-DENABLE_SQL=ON
263265
-DENABLE_SYSTEMD=ON
266+
-DMINIFI_RUST=ON
264267
-DENABLE_TEST_PROCESSORS=OFF
265268
-DFORCE_COLORED_OUTPUT=ON
266269
-DMINIFI_FAIL_ON_WARNINGS=ON

.github/workflows/verify-package.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,70 @@ jobs:
102102
with:
103103
name: ${{ matrix.platform.id }}_${{ matrix.arch }}_behavex_output_modular${{ (github.event_name != 'workflow_dispatch' || inputs.enable_fips) && '_fips' || '' }}
104104
path: build/behavex_output_modular
105+
106+
rust-tests:
107+
name: "Rusty ${{ matrix.platform.name }} (${{ matrix.arch }})"
108+
needs: [check-artifacts-workflow]
109+
if: ${{ !failure() && !cancelled() }}
110+
runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
111+
timeout-minutes: 240
112+
strategy:
113+
fail-fast: false
114+
matrix:
115+
arch: [x86_64, aarch64]
116+
platform: [
117+
{ name: "Rocky Linux 9 modular", id: "rocky9", build_cmd: "make rocky9_from_rocky_package && docker tag apacheminificpp:rocky9_from_rocky_package apacheminificpp:behave" },
118+
{ name: "Rocky Linux 10 modular", id: "rocky10", build_cmd: "make rocky10_from_rocky_package && docker tag apacheminificpp:rocky10_from_rocky_package apacheminificpp:behave" },
119+
{ name: "Rocky Linux 9 from RPM modular", id: "rocky9-rpm", build_cmd: "make rocky9_from_rpm_package && docker tag apacheminificpp:rocky9_from_rocky_package apacheminificpp:behave" },
120+
{ name: "Rocky Linux 10 from RPM modular", id: "rocky10-rpm", build_cmd: "make rocky10_from_rpm_package && docker tag apacheminificpp:rocky10_from_rpm_package apacheminificpp:behave" },
121+
{ name: "Ubuntu 22.04 modular", id: "ubuntu_jammy", build_cmd: "make jammy_from_rocky_package && docker tag apacheminificpp:jammy_from_rocky_package apacheminificpp:behave" },
122+
{ name: "Ubuntu 24.04 modular", id: "ubuntu_noble", build_cmd: "make noble_from_rocky_package && docker tag apacheminificpp:noble_from_rocky_package apacheminificpp:behave" },
123+
{ name: "Debian 12 modular", id: "debian_bookworm", build_cmd: "make bookworm_from_rocky_package && docker tag apacheminificpp:bookworm_from_rocky_package apacheminificpp:behave" },
124+
{ name: "Debian 13 modular", id: "debian_trixie", build_cmd: "make trixie_from_rocky_package && docker tag apacheminificpp:trixie_from_rocky_package apacheminificpp:behave" },
125+
]
126+
permissions:
127+
contents: read
128+
steps:
129+
- id: checkout
130+
uses: actions/checkout@v6
131+
132+
- uses: actions/download-artifact@v8
133+
with:
134+
run-id: ${{ inputs.artifacts_workflow_id || github.event.workflow_run.id }}
135+
name: minifi-${{ matrix.arch }}-tar
136+
path: build
137+
github-token: ${{ github.token }}
138+
139+
- uses: actions/download-artifact@v8
140+
with:
141+
run-id: ${{ inputs.artifacts_workflow_id || github.event.workflow_run.id }}
142+
name: minifi-${{ matrix.arch }}-rpm
143+
path: build
144+
github-token: ${{ github.token }}
145+
146+
- id: install_deps
147+
run: |
148+
sudo apt update
149+
sudo apt install -y python3-virtualenv
150+
151+
- id: test
152+
name: Docker Verify
153+
working-directory: ./minifi_rust
154+
run: cargo behave-debian
155+
156+
- name: Test Reporter
157+
if: always()
158+
uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3
159+
with:
160+
name: Docker integration tests
161+
path: minifi_rust/minifi_rs_behave/output/behave/*.xml
162+
reporter: java-junit
163+
only-summary: 'true'
164+
list-tests: 'failed'
165+
list-suites: 'failed'
166+
- name: Upload artifact
167+
if: failure()
168+
uses: actions/upload-artifact@v7
169+
with:
170+
name: ${{ matrix.platform.id }}_${{ matrix.arch }}_rusty_behave
171+
path: minifi_rust/minifi_rs_behave/output

cmake/MiNiFiOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ add_minifi_option(ENABLE_EXECUTE_PROCESS "Enable ExecuteProcess processor" OFF)
116116
add_minifi_option(ENABLE_CONTROLLER "Enables the build of MiNiFi controller binary." ON)
117117
add_minifi_option(ENABLE_LLAMACPP "Enables llama.cpp support." ON)
118118
add_minifi_option(ENABLE_OPC "Instructs the build system to enable the OPC extension" ON)
119-
add_minifi_option(MINIFI_RUST "Enables the build of rust based extension." ON)
119+
add_minifi_option(MINIFI_RUST "Enables the build of rust based extensions." OFF)
120120

121121
set_minifi_cache_variable(CUSTOM_MALLOC OFF "Overwrite malloc implementation.")
122122
set_property(CACHE CUSTOM_MALLOC PROPERTY STRINGS "jemalloc" "mimalloc" "rpmalloc" OFF)

minifi_rust/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
if (NOT (ENABLE_ALL OR MINIFI_RUST))
20+
if (NOT MINIFI_RUST)
2121
return()
2222
endif()
2323

0 commit comments

Comments
 (0)