ci: cram: align ubus DM and LCM tests

Change ubus DM and LCM path to reflect the changes done in feed-prpl

Signed-off-by: Yüce Kürüm <yuce.kurum@mind.be>
Signed-off-by: Yüce Kürüm <yuce.kurum_ext@softathome.com>
(cherry picked from commit 71157289a5ed78563ea2763d99335f3044dfaff9)
This commit is contained in:
Yüce Kürüm 2024-05-14 18:17:22 +02:00 committed by Petr Štetiar
parent 064866aadf
commit ebdb4df50f
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
8 changed files with 12 additions and 24 deletions

View File

@ -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]

View File

@ -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

View File

@ -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]

View File

@ -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]

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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: