Skip to content

Some follow-up for NUT Auth and revise Jenkinsfile-dynamatrix test-case counts - #3567

Merged
jimklimov merged 18 commits into
networkupstools:masterfrom
jimklimov:issue-3331
Aug 17, 2026
Merged

Some follow-up for NUT Auth and revise Jenkinsfile-dynamatrix test-case counts#3567
jimklimov merged 18 commits into
networkupstools:masterfrom
jimklimov:issue-3331

Conversation

@jimklimov

@jimklimov jimklimov commented Aug 13, 2026

Copy link
Copy Markdown
Member

Mostly small follow-up from #3331, and a testbed for dynamatirx refactoring so we can achieve similar coverage faster.

@jimklimov
clients/*.c et al: upscli_read_authconf_file(): add an argument to hi…
56a5296 
…de best-effort nutauth.conf discovery failure into debug log [networkupstools#3329]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/Makefile.am: SOURCE_CHECK_UNICODE: avoid printing useless SRCDIR…
cdd0e42 
…="." in some locations

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
server/upsd.c: log whether incoming data from a CLIENT is in an encry…
6f47ff0 
…pted or plaintext session [networkupstools#3331]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
clients/upsclient.c: upscli_init2(): avoid potential leak if re-enter…
6a7e61f 
…ed [networkupstools#3331]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Honour per-authconf flags_ssl (do not get stuck on default) [networku…
5c999cf 
…pstools#3331]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov added this to the 2.8.6 milestone Aug 13, 2026
@jimklimov jimklimov added CI Entries related to continuous integration infrastructure (here CI = tools + scripts + recipes) SSL/NSS Issues and PRs about SSL, TLS and other crypto-related matters Hardening Ideas and implems to make NUT deployments more robust and secure (relaxed convenience may suffer) labels Aug 13, 2026
@github-actions

github-actions Bot commented Aug 13, 2026 •
edited
Loading

Copy link
Copy Markdown

A ZIP file with standard source tarball and another tarball with pre-built docs for commit 3940683 is temporarily available: NUT-tarballs-PR-3567.zip.

@AppVeyorBot

AppVeyorBot commented Aug 13, 2026

Copy link
Copy Markdown

✅ Build nut 2.8.5.5049-master completed (commit 2d2bc6e2bd by @jimklimov)

@jimklimov
Jenkinsfile-dynamatrix: make slowBuild definitions more similar - mov…
815b6b5 
…e BUILD_TYPE into dynamatrixAxesVirtualLabelsMap everywhere [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/developers.txt: revise sections on indentation, line breaks, etc. [
8c9580a 
networkupstools#3569]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: annotate build scenarios currently used for m…
5dcfca9 
…aster branch and common PR builds [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: comment about DISTCHECK_TGT="distcheck-ci" in BUILD_TYPE…
6309a6e 
…="default-all-errors"* handler [networkupstools#3567]

Defined just in case, but currently not used (DAE does not do distcheck now).

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: dedup: limit "Various GNU C99+/C++11+ standar…
58cc679 
…d builds with fatal warnings (auto level), without distcheck and docs" scenario to non-GCC toolkits [networkupstools#3567]

They ran essentially same workload twice, as
"Various GNU C99+/C++98+ standard out-of-tree builds with fatal warnings (hard level) with GCC"

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: dedup: "Various non-docs non-distchecked targ…
61a5cef 
…et builds with main and ~newest supported C/C++ revisions" (default-nodoc) is nowadays a subset of several default-all-errors scenarios [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 14, 2026
@jimklimov
Jenkinsfile-dynamatrix: run "Various GNU C99+/C++11+ standard builds …
34e3ab4 
…with fatal warnings (auto level), without distcheck and docs" scenario also out-of-dir [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 14, 2026
@jimklimov
Jenkinsfile-dynamatrix: update labels (non-docs), comment on dedup po…
e42666b 
…tential of "all driver types on capable systems" vs. "combos with Python versions for helper scripts" [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 14, 2026
@jimklimov
Jenkinsfile-dynamatrix: comment on "all/manpage docs types" vs. "auto…
b76944d 
…tools-driven builds" [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 14, 2026
@jimklimov
Jenkinsfile-dynamatrix: define excludeCombos_AUTOTOOLS_REQUIRE_TWEAK …
3598c6e 
…to simplify rule sets maintenance [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 14, 2026
@jimklimov
Jenkinsfile-dynamatrix: introduce dynacfgPipeline.excludeCombos_AUTOT…
a35a999 
…OOLS_NOT_REQUIRE_TWEAK and dedup "manpage docs builds" vs. "autotools builds" [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot

AppVeyorBot commented Aug 14, 2026

Copy link
Copy Markdown

✅ Build nut 2.8.5.5065-master completed (commit 2efeae0c5e by @jimklimov)

@AppVeyorBot

AppVeyorBot commented Aug 14, 2026

Copy link
Copy Markdown

✅ Build nut 2.8.5.5066-master completed (commit 026118e4fc by @jimklimov)

@jimklimov
Jenkinsfile-dynamatrix: run "Various GNU C99+/C++11+ standard builds …
a012c53 
…with fatal warnings (auto level), without distcheck and docs" scenario also out-of-dir [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: update labels (non-docs), comment on dedup po…
7eadf44 
…tential of "all driver types on capable systems" vs. "combos with Python versions for helper scripts" [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: comment on "all/manpage docs types" vs. "auto…
57b5398 
…tools-driven builds" [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: define excludeCombos_AUTOTOOLS_REQUIRE_TWEAK …
bd1907e 
…to simplify rule sets maintenance [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Jenkinsfile-dynamatrix: introduce dynacfgPipeline.excludeCombos_AUTOT…
b722f33 
…OOLS_NOT_REQUIRE_TWEAK and dedup "manpage docs builds" vs. "autotools builds" [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot

AppVeyorBot commented Aug 14, 2026

Copy link
Copy Markdown

✅ Build nut 2.8.5.5067-master completed (commit 730b389a33 by @jimklimov)

jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 15, 2026
@jimklimov
Jenkinsfile-dynamatrix: move BUILD_TYPE requirements back from labels…
490635c 
… to env [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot

AppVeyorBot commented Aug 15, 2026

Copy link
Copy Markdown

✅ Build nut 2.8.5.5068-master completed (commit 860277a284 by @jimklimov)

@jimklimov
Jenkinsfile-dynamatrix: move BUILD_TYPE requirements back from labels…
fa125e3 
… to env [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/man/upsmon.txt, conf/upsmon.conf.sample.in: document SUSPEND_TIM…
3940683 
…EJUMP_UNEXPECTED and update other suggestions [networkupstools#3405]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
jimklimov merged commit fc850db into networkupstools:master Aug 17, 2026
11 of 24 checks passed
@jimklimov
jimklimov deleted the issue-3331 branch August 17, 2026 17:43
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 18, 2026
@jimklimov
Jenkinsfile-dynamatrix: "Strict-C and GNU C89/C++98 standard builds w…
ab041bb 
…ith fatal warnings (auto level) and GCC toolkits" filter does not actually select Strict-C - be more explicit about this in code/comments [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 18, 2026
@jimklimov
Jenkinsfile-dynamatrix: rephrase dynacfgPipeline.excludeCombos_AUTOTO…
98b887a 
…OLS_REQUIRE_TWEAK definition as a nested collection [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov mentioned this pull request Aug 18, 2026
Open
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 19, 2026
@jimklimov
*/.c: fix comments to C89 block style [networkupstools#3567]
38a7525 
Pass at least GCC builds

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov added a commit to jimklimov/nut that referenced this pull request Aug 19, 2026
@jimklimov
Jenkinsfile-dynamatrix: in "Strict-C..." filter qw had strict C exclu…
3fedec3 
…ded - bring it back [networkupstools#3567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov

jimklimov commented Aug 19, 2026

Copy link
Copy Markdown
Member Author

The mix of Jenkinsfile changes in this PR and jenkins-dynamatrix in its repo, iterated together, led to non-instantiation of several slow build scenario groups that were expected to be seen (and correctly removed scenarios which this PR made redundant). Those groups are further recovered in work on PR #3577, again with bits of solution in both Jenkins library and consumer repos.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

CI Entries related to continuous integration infrastructure (here CI = tools + scripts + recipes) Hardening Ideas and implems to make NUT deployments more robust and secure (relaxed convenience may suffer) SSL/NSS Issues and PRs about SSL, TLS and other crypto-related matters

Projects

None yet

Milestone

2.8.6

Development

Successfully merging this pull request may close these issues.

2 participants

@jimklimov @AppVeyorBot