maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5c4d350c62
prplos/.gitlab
History
Petr Štetiar 5c4d350c62 ci: cram: 110-prplmesh-dataelements: fix assert agent count per testbed 
Currently the cram test fails to assert the correct connected agent
count as the previous change in commit c5824479fc ("ci: cram:
110-prplmesh-dataelements: assert agent count per testbed") was pushed
by accident without being properly tested.

The output of prplmesh_cli prefixes the line containing the connected
agent count with a tab character, meaning there is no literal space
character before the digit. Since the sed regex pattern requires a
literal space, the pattern match fails, leaving the extracted agent
count empty.

 --- .gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
 +++ .gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t.err
 @@ -215,6 +215,7 @@
   >     | sed -nE 's/.* ([0-9]+) agent\(s\) connected.*/\1/p')
   $ if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then EXP=2; else EXP=1; fi
   $ test "$ACT" = "$EXP" || echo "agent count mismatch: actual=$ACT expected=$EXP"
 +  agent count mismatch: actual= expected=2

So lets fix this by replacing the sed extraction pattern with a simpler
awk command, which has been verified locally on OSPv2. Since awk's
default field separator handles whitespace (both spaces and tabs)
uniformly, it successfully extracts the agent count.

Apply the same per-testbed agent-count assertion to the OSPv2
(mxl25641-hdk-6) and arcadyan-mozart boards, which had the count
hardcoded to 1 and thus hit the identical failure on testbed-02 where
prplmesh_cli now reports 2 connected agents (HomePlug-backhauled
TL-WPA7817, PCF-2504):

 --- .gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
 +++ .gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t.err
 @@ -179,7 +179,7 @@
    Mode: Agent+Controller
    Controller:
            bridge MAC: (4C:BA:7D|A8:C2:46|AC:9A:96):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re)
 -          1 agent(s) connected
 +          2 agent(s) connected

Fixes: PCF-2578
Closes: PPW-1981
References: PCF-2504
Assisted-by: claude:opus-4-8:1m-context
Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/14374275747#L951
Link: https://gitlab.com/prpl-foundation/prplos/prplos/-/jobs/14527766714#L955
Fixes: c5824479fc ("ci: cram: 110-prplmesh-dataelements: assert agent count per testbed")
Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
2026-06-01 14:39:29 +00:00
..
cdrouter PROVISORY: ci: cdrouter: OSPv2: switch CDRouter-UPnP-IPv46 USP MTP from MQTTv5 to WebSocket 2026-05-22 13:33:05 +00:00
certs ci: ssh-server: add tests for pubkey auth and session features 2025-07-31 10:35:18 +00:00
docker ci: cram: new test development for tr181-periodicfileupload 2026-02-19 15:11:44 +01:00
mockups ci: sync with current prplos branch state 2025-07-31 10:31:53 +00:00
scripts ci: testbed,cdrouter: add opt-in obuspa debug logging 2026-05-22 13:33:05 +00:00
testbed ci: release,testbed: OSPv2: make firmware filenames UPDK 9.2.3 compliant 2026-01-29 10:46:42 +00:00
tests ci: cram: 110-prplmesh-dataelements: fix assert agent count per testbed 2026-06-01 14:39:29 +00:00
blackduck.yml ci: blackduck: Add tar.gz archiving of BlackDuck scan output 2025-11-21 12:35:44 +01:00
build.yml PROVISORY: build: Freedom: workaround build issue of mac80211 in ATH13.1ED 2026-03-06 16:19:48 +01:00
cdrouter.yml ci: testbed,cdrouter: add opt-in obuspa debug logging 2026-05-22 13:33:05 +00:00
coverity.yml ci: coverity: disable CONFIG_REGULATOR_CPR3 to fix cov-emit crash 2026-03-27 09:06:31 +00:00
docker.yml ci: fix wasting of runtime testing resources after failed builds 2025-07-31 15:27:24 +00:00
prplmesh.yml ci: prplMesh: unbuffer python stdout 2025-10-15 10:06:24 +00:00
README.md profiles,ci: sunset webui profile 2025-07-31 10:33:15 +00:00
release.yml ci: release,testbed: OSPv2: make firmware filenames UPDK 9.2.3 compliant 2026-01-29 10:46:42 +00:00
sdk.yml ci: ipq807x: fix filenames and references after target rename to qualcommax 2025-07-31 15:25:51 +00:00
testbed.yml ci: testbed,cdrouter: add opt-in obuspa debug logging 2026-05-22 13:33:05 +00:00

README.md

Content

This directory contains stuff used on the GitLab CI.

docker

Contains definitions for Docker images.

testbed

Contains definitions for testbed related tests.

scripts

Contains scripts used on GitLab CI.

tests

Contains tests used on GitLab CI.

build.yml

Contains definition of the GitLab CI build test job templates used during build stage. Those templates can then be extended by other GitLab CI jobs in order to keep things DRY.

.build test config

Allows build testing of specific configurations defined in the profiles directory, using scripts/gen_config.py under the hood.

Example usage:

include:
 - local: .gitlab/build.yml

stages:
 - build

build test netgear-rax40 prpl:
  extends: .build test config

Which is going to build test prplOS with netgear-rax40 and prpl profiles.

Description of CI variables:

  • CI_BUILD_CONFIG_EXTRA - list of additional config options which should be enabled(prefixed with +) or disabled (prefixed with -), for example +BUILD_LOG -SDK would result in CONFIG_BUILD_LOG=y and CONFIG_SDK=y config symbols in .config file.

docker.yml

Provides support for building, tagging and pushing the Docker images to image registry.

For example let's build image foo.

Prerequisites:

  • Create directory for new Docker image mkdir -p .gitlab/docker/foo
  • Docker image description $EDITOR .gitlab/docker/foo/Dockefile

Then just put following into .gitlab/docker/foo/gitlab.yml

build Docker image foo:
  extends: .build Docker image

testbed.yml

Provides bits needed for runtime testing on real device using labgrid Python testing framework.

Supported devices:

  • Netgear RAX40

sdk.yml

Provides support for the OpenWrt SDK utilizing the Docker SDK container under the hood.

.build feed with SDK

Allows compile testing of packages using the SDK.

Example usage, build testing of safec3 package from Intel's feed_opensource_apps feed.

include:
  - remote: https://gitlab.com/prpl-foundation/prplOS/prplos/-/raw/prplos/.gitlab/sdk.yml

build:
  extends: .build feed with SDK
  variables:
    CI_SDK_INSTALL_FEEDS: feed_target_mips
    CI_SDK_BUILD_PACKAGES: safec3

Description of CI variables:

  • CI_SDK_INSTALL_FEEDS - list of feeds which should be installed prior to building packages.
  • CI_SDK_BUILD_PACKAGES - list of packages which should be compile tested.
  • CI_SDK_BUILD_PARALLEL - max number of threads to use for make (defaults to nproc if unset).

.generate SDK package build jobs

Generates sdk-package-jobs.yml with separate build jobs for every package so the builds of those packages can run in parallel. It's supposed to be executed by the child pipeline .execute SDK package build jobs.

.execute SDK package build jobs

It's supposed to execute jobs generated in sdk-package-jobs.yml generated by .generate SDK package build jobs job.