From 05a30b1404a6edeb5d49b491e564b86eb979bb26 Mon Sep 17 00:00:00 2001 From: Hela Saadani Date: Tue, 6 Jan 2026 10:03:20 +0100 Subject: [PATCH] ci: test: cram: align expected output with upstream openwrt changes New packages ivykis and liburing appear in the expected build config because upstream openwrt/packages commit 8fcf45d05a changed syslog-ng to depend on an external ivykis package (instead of the previously embedded copy). ivykis in turn pulls in liburing when io_uring support is enabled in the kernel. References: PCF-1982 Signed-off-by: Hela Saadani --- .gitlab/tests/cram/arcadyan-mozart/005-build-config.t | 3 ++- .gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t | 3 ++- .gitlab/tests/cram/prpl-haze/005-build-config.t | 3 ++- .gitlab/tests/cram/turris-omnia/005-build-config.t | 3 ++- .gitlab/tests/cram/urx851-b0-dk/005-build-config.t | 3 ++- .gitlab/tests/cram/wnc-freedom/005-build-config.t | 2 ++ 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitlab/tests/cram/arcadyan-mozart/005-build-config.t b/.gitlab/tests/cram/arcadyan-mozart/005-build-config.t index 2f5ccd5cb3..d29debbb16 100644 --- a/.gitlab/tests/cram/arcadyan-mozart/005-build-config.t +++ b/.gitlab/tests/cram/arcadyan-mozart/005-build-config.t @@ -136,6 +136,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_iptables-mod-nfqueue=y CONFIG_PACKAGE_iptables-zz-legacy=y CONFIG_PACKAGE_iputils-ping=y + CONFIG_PACKAGE_ivykis=y # CONFIG_PACKAGE_jansson is not set CONFIG_PACKAGE_kmod-asn1-decoder=y CONFIG_PACKAGE_kmod-ebtables=y @@ -280,6 +281,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_libunbound-prpl=y CONFIG_PACKAGE_libupnp-prpl=y CONFIG_PACKAGE_liburcu=y + CONFIG_PACKAGE_liburing=y CONFIG_PACKAGE_libusb-1.0=y CONFIG_PACKAGE_libusp=y CONFIG_PACKAGE_libuspi=y @@ -869,5 +871,4 @@ Assure expected build configuration (PCF-1413): CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/24.10-SNAPSHOT" CONFIG_VERSION_SUPPORT_URL="https://jira.prplfoundation.org" CONFIG_shadow-all=y - # CONFIG_VERSION_CODE_FILENAMES is not set # CONFIG_VERSION_FILENAMES is not set diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t index 1e2262bdc5..cbee777943 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t @@ -287,6 +287,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_iptables-mod-nfqueue=y CONFIG_PACKAGE_iptables-zz-legacy=y CONFIG_PACKAGE_iputils-ping=y + CONFIG_PACKAGE_ivykis=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_iwlwav-firmware=y @@ -593,6 +594,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_libunbound-prpl=y CONFIG_PACKAGE_libupnp-prpl=y CONFIG_PACKAGE_liburcu=y + CONFIG_PACKAGE_liburing=y CONFIG_PACKAGE_libusb-1.0=y CONFIG_PACKAGE_libusp=y CONFIG_PACKAGE_libuspi=y @@ -1298,5 +1300,4 @@ Assure expected build configuration (PCF-1413): CONFIG_WIRELESS_AFC=y CONFIG_WIRELESS_STA=y CONFIG_shadow-all=y - # CONFIG_VERSION_CODE_FILENAMES is not set # CONFIG_VERSION_FILENAMES is not set diff --git a/.gitlab/tests/cram/prpl-haze/005-build-config.t b/.gitlab/tests/cram/prpl-haze/005-build-config.t index 43bb63bd8c..6ca607d353 100644 --- a/.gitlab/tests/cram/prpl-haze/005-build-config.t +++ b/.gitlab/tests/cram/prpl-haze/005-build-config.t @@ -136,6 +136,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_iptables-mod-nfqueue=y CONFIG_PACKAGE_iptables-zz-legacy=y CONFIG_PACKAGE_iputils-ping=y + CONFIG_PACKAGE_ivykis=y # CONFIG_PACKAGE_jansson is not set # CONFIG_PACKAGE_iw is not set CONFIG_PACKAGE_iw-full=y @@ -276,6 +277,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_libunbound-prpl=y CONFIG_PACKAGE_libupnp=y CONFIG_PACKAGE_liburcu=y + CONFIG_PACKAGE_liburing=y CONFIG_PACKAGE_libusb-1.0=y CONFIG_PACKAGE_libusp=y CONFIG_PACKAGE_libuspi=y @@ -796,5 +798,4 @@ Assure expected build configuration (PCF-1413): CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/24.10-SNAPSHOT" CONFIG_VERSION_SUPPORT_URL="https://jira.prplfoundation.org" CONFIG_shadow-all=y - # CONFIG_VERSION_CODE_FILENAMES is not set # CONFIG_VERSION_FILENAMES is not set diff --git a/.gitlab/tests/cram/turris-omnia/005-build-config.t b/.gitlab/tests/cram/turris-omnia/005-build-config.t index a24d70dfa8..b872163469 100644 --- a/.gitlab/tests/cram/turris-omnia/005-build-config.t +++ b/.gitlab/tests/cram/turris-omnia/005-build-config.t @@ -154,6 +154,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_iptables-mod-nfqueue=y CONFIG_PACKAGE_iptables-zz-legacy=y CONFIG_PACKAGE_iputils-ping=y + CONFIG_PACKAGE_ivykis=y # CONFIG_PACKAGE_jansson is not set # CONFIG_PACKAGE_iw is not set CONFIG_PACKAGE_iw-full=y @@ -294,6 +295,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_libudev-zero=y CONFIG_PACKAGE_libunbound-prpl=y CONFIG_PACKAGE_libupnp=y + CONFIG_PACKAGE_liburing=y CONFIG_PACKAGE_libusb-1.0=y CONFIG_PACKAGE_libusp=y CONFIG_PACKAGE_libuspi=y @@ -816,5 +818,4 @@ Assure expected build configuration (PCF-1413): CONFIG_VERSION_SUPPORT_URL="https://jira.prplfoundation.org" CONFIG_WPA_MBO_SUPPORT=y CONFIG_shadow-all=y - # CONFIG_VERSION_CODE_FILENAMES is not set # CONFIG_VERSION_FILENAMES is not set diff --git a/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t b/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t index 6956408cea..3a32cbdac4 100644 --- a/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t +++ b/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t @@ -263,6 +263,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_iptables-mod-nfqueue=y CONFIG_PACKAGE_iptables-zz-legacy=y CONFIG_PACKAGE_iputils-ping=y + CONFIG_PACKAGE_ivykis=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_iwlwav-firmware=y CONFIG_PACKAGE_iwlwav-hostap-ng-uci=y @@ -510,6 +511,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_libugwhelper=y CONFIG_PACKAGE_libunbound-prpl=y CONFIG_PACKAGE_libupnp=y + CONFIG_PACKAGE_liburing=y CONFIG_PACKAGE_libusb-1.0=y CONFIG_PACKAGE_libusp=y CONFIG_PACKAGE_libuspi=y @@ -1080,5 +1082,4 @@ Assure expected build configuration (PCF-1413): CONFIG_VERSION_SUPPORT_URL="https://jira.prplfoundation.org" CONFIG_WIRELESS_STA=y CONFIG_shadow-all=y - # CONFIG_VERSION_CODE_FILENAMES is not set # CONFIG_VERSION_FILENAMES is not set diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t index 9f9bf11596..e3ded29f6e 100644 --- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t +++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t @@ -182,6 +182,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_iptables-mod-nfqueue=y CONFIG_PACKAGE_iptables-zz-legacy=y CONFIG_PACKAGE_iputils-ping=y + CONFIG_PACKAGE_ivykis=y # CONFIG_PACKAGE_jansson is not set CONFIG_PACKAGE_keyctl=y CONFIG_PACKAGE_keyutils=y @@ -407,6 +408,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_libunbound-prpl=y CONFIG_PACKAGE_libupnp-prpl=y CONFIG_PACKAGE_liburcu=y + CONFIG_PACKAGE_liburing=y CONFIG_PACKAGE_libusb-1.0=y CONFIG_PACKAGE_libusp=y CONFIG_PACKAGE_libuspi=y