From ebdb4df50fa00a6bf5c658937fa7fedeeb3f2cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BCce=20K=C3=BCr=C3=BCm?= Date: Tue, 14 May 2024 18:17:22 +0200 Subject: [PATCH] ci: cram: align ubus DM and LCM tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change ubus DM and LCM path to reflect the changes done in feed-prpl Signed-off-by: Yüce Kürüm Signed-off-by: Yüce Kürüm (cherry picked from commit 71157289a5ed78563ea2763d99335f3044dfaff9) --- .../generic/acceleration-plan-components/040-lcm.t | 8 ++++---- .gitlab/tests/cram/generic/ubus-datamodel-list.t | 12 ------------ .../acceleration-plan-components/030-lcm.t | 4 ++-- .../acceleration-plan-components/030-lcm.t | 4 ++-- .../prpl-haze/acceleration-plan-components/030-lcm.t | 2 +- .../acceleration-plan-components/030-lcm.t | 2 +- .../acceleration-plan-components/030-lcm.t | 2 +- .../acceleration-plan-components/030-lcm.t | 2 +- 8 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/040-lcm.t b/.gitlab/tests/cram/generic/acceleration-plan-components/040-lcm.t index 839fe96cfb..fb1f46d9fe 100644 --- a/.gitlab/tests/cram/generic/acceleration-plan-components/040-lcm.t +++ b/.gitlab/tests/cram/generic/acceleration-plan-components/040-lcm.t @@ -20,14 +20,14 @@ Check that random LXC binaries work: Check Cthulhu.Config datamodel: $ R "ubus -S call Cthulhu.Config _get" - {"Cthulhu.Config.":{"PluginLocation":"/usr/lib/amx/cthulhu/plugins","ImageLocation":"/usr/share/rlyeh/images","UseOverlayFS":true,"UseBundles":false,"OnboardingLocation":"/etc/amx/cthulhu/onboard","StorageLocation":"/usr/share/cthulhu","OnboardingFile":"/usr/share/cthulhu/cthulhu_onboarded","DefaultBackend":"/usr/lib/cthulhu-lxc/cthulhu-lxc.so","BundleLocation":"/usr/share/celephais/bundles","BlobLocation":"/usr/share/rlyeh/blobs"}} + {"Cthulhu.Config.":{"PluginLocation":"/usr/lib/amx/cthulhu/plugins","ImageLocation":"/lcm_data/rlyeh/images","UseOverlayFS":true,"UseBundles":false,"OnboardingLocation":"/etc/amx/cthulhu/onboard","StorageLocation":"/lcm_data/cthulhu","OnboardingFile":"/lcm_data/cthulhu/cthulhu_onboarded","DefaultBackend":"/usr/lib/cthulhu-lxc/cthulhu-lxc.so","BundleLocation":"/lcm_data/celephais/bundles","BlobLocation":"/lcm_data/rlyeh/blobs"}} {} {"amxd-error-code":0} Check Rlyeh datamodel: $ R "ubus -S call Rlyeh _get" - {"Rlyeh.":{"ImageLocation":"/usr/share/rlyeh/images","ROImageLocation":"/usr/rlyeh/images","ROStorageLocation":"/usr/rlyeh/blobs","CertificateVerification":true,"SignatureVerification":true,"RemainingDiskSpaceBytes":1000001,"StorageLocation":"/usr/share/rlyeh/blobs","OnboardingFile":"/usr/share/rlyeh_onboarded"}} + {"Rlyeh.":{"ImageLocation":"/lcm_data/rlyeh/images","ROImageLocation":"/usr/rlyeh/images","ROStorageLocation":"/usr/rlyeh/blobs","CertificateVerification":true,"SignatureVerification":true,"RemainingDiskSpaceBytes":1000001,"StorageLocation":"/lcm_data/rlyeh/blobs","OnboardingFile":"/lcm_data/rlyeh_onboarded"}} {} {"amxd-error-code":0} @@ -95,6 +95,6 @@ Check that Rlyeh has no container images: Check that testing image is gone from the filesystem as well: - $ R "ls -al /usr/share/rlyeh/images/prplos/prplos-testing-container-intel_mips-xrx500" - ls: /usr/share/rlyeh/images/prplos/prplos-testing-container-intel_mips-xrx500: No such file or directory + $ R "ls -al /lcm_data/rlyeh/images/prplos/prplos-testing-container-intel_mips-xrx500" + ls: /lcm_data/rlyeh/images/prplos/prplos-testing-container-intel_mips-xrx500: No such file or directory [1] diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t index a21a03ca2b..e52ce173f1 100644 --- a/.gitlab/tests/cram/generic/ubus-datamodel-list.t +++ b/.gitlab/tests/cram/generic/ubus-datamodel-list.t @@ -66,17 +66,12 @@ Check that ubus has expected datamodels available: DSLite.InterfaceSetting Device Device.Bridging - Device.BulkData Device.Buttons Device.CWMPManagementServer Device.CaptivePortal - Device.ConMon Device.DHCPv4 - Device.DHCPv4.Client - Device.DHCPv4.Relay Device.DHCPv4.Server Device.DHCPv6 - Device.DHCPv6.Client Device.DHCPv6.Server Device.DNS Device.DNS.SD @@ -85,18 +80,13 @@ Check that ubus has expected datamodels available: Device.DynamicDNS Device.Ethernet Device.Firewall - Device.HomePlug Device.Hosts Device.IP Device.IP.Diagnostics Device.InterfaceStack - Device.LANConfigSecurity Device.LEDs - Device.LocalAgent Device.Logical - Device.MQTT Device.ManagementServer - Device.MoCA Device.NAT Device.NeighborDiscovery Device.PCP @@ -111,8 +101,6 @@ Check that ubus has expected datamodels available: Device.Syslog Device.Time Device.UPnP - Device.UPnP.Description - Device.UPnP.Discovery Device.UserInterface Device.Users Device.WiFi diff --git a/.gitlab/tests/cram/glinet-b1300/acceleration-plan-components/030-lcm.t b/.gitlab/tests/cram/glinet-b1300/acceleration-plan-components/030-lcm.t index 10891a0e2e..75fce576b4 100644 --- a/.gitlab/tests/cram/glinet-b1300/acceleration-plan-components/030-lcm.t +++ b/.gitlab/tests/cram/glinet-b1300/acceleration-plan-components/030-lcm.t @@ -89,6 +89,6 @@ Check that Rlyeh has no container images: Check that container image is gone from the filesystem as well: - $ R "ls -al /usr/share/rlyeh/images/prplos" - ls: /usr/share/rlyeh/images/prplos: No such file or directory + $ R "ls -al /lcm_data/rlyeh/images/prplos" + ls: /lcm_data/rlyeh/images/prplos: No such file or directory [1] diff --git a/.gitlab/tests/cram/nec-wx3000hp/acceleration-plan-components/030-lcm.t b/.gitlab/tests/cram/nec-wx3000hp/acceleration-plan-components/030-lcm.t index 2bdc7d79bd..2e6a8c18ea 100644 --- a/.gitlab/tests/cram/nec-wx3000hp/acceleration-plan-components/030-lcm.t +++ b/.gitlab/tests/cram/nec-wx3000hp/acceleration-plan-components/030-lcm.t @@ -96,6 +96,6 @@ Check that Rlyeh has no container images: Check that container image is gone from the filesystem as well: - $ R "ls -al /usr/share/rlyeh/images/prplos" - ls: /usr/share/rlyeh/images/prplos: No such file or directory + $ R "ls -al /lcm_data/rlyeh/images/prplos" + ls: /lcm_data/rlyeh/images/prplos: No such file or directory [1] diff --git a/.gitlab/tests/cram/prpl-haze/acceleration-plan-components/030-lcm.t b/.gitlab/tests/cram/prpl-haze/acceleration-plan-components/030-lcm.t index ccfec3427f..db476a2495 100644 --- a/.gitlab/tests/cram/prpl-haze/acceleration-plan-components/030-lcm.t +++ b/.gitlab/tests/cram/prpl-haze/acceleration-plan-components/030-lcm.t @@ -12,8 +12,8 @@ Check Cthulhu.Sandbox datamodel: Check Cthulhu.Config datamodel: $ R "ubus -S call Cthulhu.Config _get | jsonfilter -e @[*].UseOverlayFS -e @[*].DefaultBackend -e @[*].ImageLocation | sort" + /lcm_data/rlyeh/images /usr/lib/cthulhu-lxc/cthulhu-lxc.so - /usr/share/rlyeh/images true Install testing prplOS container v1: diff --git a/.gitlab/tests/cram/turris-omnia/acceleration-plan-components/030-lcm.t b/.gitlab/tests/cram/turris-omnia/acceleration-plan-components/030-lcm.t index 089f5064ea..68aff88d4c 100644 --- a/.gitlab/tests/cram/turris-omnia/acceleration-plan-components/030-lcm.t +++ b/.gitlab/tests/cram/turris-omnia/acceleration-plan-components/030-lcm.t @@ -12,8 +12,8 @@ Check Cthulhu.Sandbox datamodel: Check Cthulhu.Config datamodel: $ R "ubus -S call Cthulhu.Config _get | jsonfilter -e @[*].UseOverlayFS -e @[*].DefaultBackend -e @[*].ImageLocation | sort" + /lcm_data/rlyeh/images /usr/lib/cthulhu-lxc/cthulhu-lxc.so - /usr/share/rlyeh/images true Install testing prplOS container v1: diff --git a/.gitlab/tests/cram/urx851-b0-dk/acceleration-plan-components/030-lcm.t b/.gitlab/tests/cram/urx851-b0-dk/acceleration-plan-components/030-lcm.t index 95f1660b4f..4d41d41429 100644 --- a/.gitlab/tests/cram/urx851-b0-dk/acceleration-plan-components/030-lcm.t +++ b/.gitlab/tests/cram/urx851-b0-dk/acceleration-plan-components/030-lcm.t @@ -12,8 +12,8 @@ Check Cthulhu.Sandbox datamodel: Check Cthulhu.Config datamodel: $ R "ubus -S call Cthulhu.Config _get | jsonfilter -e @[*].UseOverlayFS -e @[*].DefaultBackend -e @[*].ImageLocation | sort" + /lcm_data/rlyeh/images /usr/lib/cthulhu-lxc/cthulhu-lxc.so - /usr/share/rlyeh/images true Install testing prplOS container v1: diff --git a/.gitlab/tests/cram/wnc-freedom/acceleration-plan-components/030-lcm.t b/.gitlab/tests/cram/wnc-freedom/acceleration-plan-components/030-lcm.t index ccfec3427f..db476a2495 100644 --- a/.gitlab/tests/cram/wnc-freedom/acceleration-plan-components/030-lcm.t +++ b/.gitlab/tests/cram/wnc-freedom/acceleration-plan-components/030-lcm.t @@ -12,8 +12,8 @@ Check Cthulhu.Sandbox datamodel: Check Cthulhu.Config datamodel: $ R "ubus -S call Cthulhu.Config _get | jsonfilter -e @[*].UseOverlayFS -e @[*].DefaultBackend -e @[*].ImageLocation | sort" + /lcm_data/rlyeh/images /usr/lib/cthulhu-lxc/cthulhu-lxc.so - /usr/share/rlyeh/images true Install testing prplOS container v1: