ENT-8118: Added os_version_minor sys variable #5777

victormlg · 2025-04-23T09:57:04Z

No description provided.

github-actions · 2025-05-26T19:35:06Z

Marking this PR as stale due to inactivity; it will be closed in 7 days.

larsewi

Looks good 🚀 Would be nice if you could add an acceptance test. You can use os_version_major.cf as inspiration.

libenv/sysinfo.c

larsewi

I think you will have to derive os_version_minor from somewhere else on Windows. We don't want it to be "Unknown" on supported platforms.

libenv/sysinfo.c

victormlg · 2025-06-13T08:00:30Z

@cf-bottom jenkins, please

cf-bottom · 2025-06-13T08:05:04Z

Sure, I triggered a build:

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12226/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12226/

larsewi · 2025-06-24T08:18:59Z

Build for Windows (no tests)

Packages here

victormlg · 2025-06-24T14:28:19Z

I tested sys.os_version_minor on a win-2019-dev-v8 ami and got the following:

It looks like it is working. It's difficult to make sense of a "os version minor" on this type of machine. Here is the version of the OS that I got by running winver

olehermanse · 2025-06-25T12:43:26Z

That's okay, I guess. From your screenshot I would kind of expect the minor version to be 1809.

larsewi

Great work @victormlg 🚀 Only some smaller comments. Not sure what to do about Windows. Maybe $(sys.os_version_minor) -> Unknown is okey?

libenv/sysinfo.c

tests/acceptance/01_vars/01_basic/os_version_minor.cf

larsewi

Looks good 🚀 The fixes to the C code should be amended to the first commit though

larsewi · 2025-06-27T08:09:55Z

@cf-bottom Jenkins with exotics please :)

cf-bottom · 2025-06-27T08:14:26Z

Sure, I triggered a build:

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12300/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12300/

larsewi

Acceptance test failed on redhat 7

FAIL (UNEXPECTED FAILURE) ./01_vars/01_basic/os_version_minor.cf

See log below

R: Version number extracted from class: centos_7_9
R: Defined classes: centos
R: Defined classes: feature_tls_1_0
R: Defined classes: GMT_Min31
R: Defined classes: ipv4_192_168
R: Defined classes: feature_copyfrom_restrict_keys
R: Defined classes: Lcycle_0
R: Defined classes: GMT_Yr2025
R: Defined classes: feature_def
R: Defined classes: Hr08_Q3
R: Defined classes: cfengine_3_27
R: Defined classes: feature_yaml
R: Defined classes: ipv4_192_168_121
R: Defined classes: June
R: Defined classes: error_mode
R: Defined classes: x86_64
R: Defined classes: warning_mode
R: Defined classes: net_iface_lo
R: Defined classes: GMT_Lcycle_0
R: Defined classes: ipv4_127_0
R: Defined classes: cfengine_3
R: Defined classes: GMT_Morning
R: Defined classes: feature_def_json_preparse
R: Defined classes: GMT_Friday
R: Defined classes: feature_host_specific_data_load
R: Defined classes: feature_host
R: Defined classes: GMT_Hr08
R: Defined classes: linux
R: Defined classes: 1_cpusocket
R: Defined classes: centos_7_x64_j2
R: Defined classes: GMT_Min30_35
R: Defined classes: redhat
R: Defined classes: DEBUG
R: Defined classes: systemd
R: Defined classes: GMT_June
R: Defined classes: compiled_on_linux_gnu
R: Defined classes: feature_host_specific_data
R: Defined classes: feature
R: Defined classes: cfengine
R: Defined classes: mac_52_54_00_0c_ef_5c
R: Defined classes: cfengine_3_27_0a_f77177768
R: Defined classes: 64_bit
R: Defined classes: linux_3_10_0_1127_el7_x86_64
R: Defined classes: notice_mode
R: Defined classes: feature_curl
R: Defined classes: feature_tls_1_3
R: Defined classes: linux_x86_64_3_10_0_1127_el7_x86_64__1_SMP_Tue_Mar_31_23_36_51_UTC_2020
R: Defined classes: feature_tls_1
R: Defined classes: agent
R: Defined classes: GMT_Day27
R: Defined classes: ipv4_192_168_121_34
R: Defined classes: 127_0_0_1
R: Defined classes: Friday
R: Defined classes: any
R: Defined classes: feature_copyfrom
R: Defined classes: feature_copyfrom_restrict
R: Defined classes: ipv4_gw_192_168_121_1
R: Defined classes: centos_7_9
R: Defined classes: centos_7
R: Defined classes: linux_x86_64_3_10_0_1127_el7_x86_64
R: Defined classes: ipv4_127_0_0_1
R: Defined classes: cfengine_3_27_0a
R: Defined classes: GMT_Hr8
R: Defined classes: net_iface_eth0
R: Defined classes: ipv4_192
R: Defined classes: feature_xml
R: Defined classes: 1_cpu
R: Defined classes: Day27
R: Defined classes: inform_mode
R: Defined classes: 192_168_121_34
R: Defined classes: linux_x86_64
R: Defined classes: Min30_35
R: Defined classes: ipv4_127_0_0
R: Defined classes: feature_def_json
R: Defined classes: feature_tls_1_1
R: Defined classes: feature_host_specific
R: Defined classes: Hr8
R: Defined classes: GMT_Q3
R: Defined classes: feature_pam
R: Defined classes: Morning
R: Defined classes: feature_tls
R: Defined classes: AUTO
R: Defined classes: community_edition
R: Defined classes: ipv4_127
R: Defined classes: Min31
R: Defined classes: Yr2025
R: Defined classes: Q3
R: Defined classes: GMT_Hr08_Q3
R: Defined classes: feature_tls_1_2
R: Defined classes: Hr08
R: /home/jenkins/workspace/testing-pr/label/PACKAGES_x86_64_linux_redhat_7/cfengine-3.27.0a.f77177768/tests/acceptance/./01_vars/01_basic/os_version_minor.cf Expected: 9
R: /home/jenkins/workspace/testing-pr/label/PACKAGES_x86_64_linux_redhat_7/cfengine-3.27.0a.f77177768/tests/acceptance/./01_vars/01_basic/os_version_minor.cf Found: Unknown
R: /home/jenkins/workspace/testing-pr/label/PACKAGES_x86_64_linux_redhat_7/cfengine-3.27.0a.f77177768/tests/acceptance/./01_vars/01_basic/os_version_minor.cf FAIL

victormlg · 2025-07-07T09:52:28Z

@cf-bottom Jenkins with exotics please :)

cf-bottom · 2025-07-07T09:54:34Z

Sure, I triggered a build:

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12336/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12336/

victormlg · 2025-07-07T12:46:12Z

@cf-bottom Jenkins with exotics please :)

cf-bottom · 2025-07-07T12:50:41Z

Alright, I triggered a build:

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12337/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12337/

libenv/sysinfo.c

victormlg · 2025-07-08T11:17:17Z

@cf-bottom Jenkins with exotics please :)

cf-bottom · 2025-07-08T11:19:38Z

Sure, I triggered a build:

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12338/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12338/

libenv/sysinfo.c

victormlg · 2025-07-14T13:02:21Z

@cf-bottom Jenkins with exotics please :)

cf-bottom · 2025-07-14T13:04:55Z

Sure, I triggered a build:

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12352/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12352/

Ticket: ENT-8118 Signed-off-by: Victor Moene <victor.moene@northern.tech>

Signed-off-by: Victor Moene <victor.moene@northern.tech>

victormlg · 2025-07-15T10:27:39Z

@cf-bottom Jenkins with exotics please :)

cf-bottom · 2025-07-15T10:29:59Z

Alright, I triggered a build:

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12356/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12356/

olehermanse · 2025-07-15T15:07:39Z

tests/acceptance/01_vars/01_basic/os_version_minor.cf

+    any::
+      "os_class"
+        string => nth(classesmatching("$(class_regex)"), "0");


Reading this, my first reaction is that it feels a bit too complicated and advanced, I would expect something like:

classes: ubuntu_20_04|ubuntu_22_04|ubuntu_24_04:: "ok" if => strcmp("$(sys.os_version_minor)", "4"); "not_ok" if => not(strcmp("$(sys.os_version_minor)", "4")); debian_12_11:: "ok" if => strcmp("$(sys.os_version_minor)", "11"); "not_ok" if => not(strcmp("$(sys.os_version_minor)", "11")); reports: ok.!not_ok:: "Pass"; !ok|not_ok:: "Fail";

That's much easier to read, and gives me more confidence that the test is actually working correctly. However, it will be hard, impossible even, to cover all platforms like this, especially future ones. So maybe a combination would be good? One test which is dynamic and uses regex and covers everything, and one which is stupid and simple and "bulletproof" but doesn't cover all possible platforms?

olehermanse · 2025-07-15T15:08:32Z

libenv/sysinfo.c

@@ -2506,6 +2608,7 @@ static int Linux_Misc_Version(EvalContext *ctx)
                nt_static_assert((sizeof(version)) > 255);
                sscanf(sp + strlen("DISTRIB_RELEASE="), "%255[^\n]", version);
                CanonifyNameInPlace(version);
+                SysOSVersionMinorPutFromVersion(ctx, "", version, "source=agent, derived-from=/etc/lsb_release");


Suggested change

SysOSVersionMinorPutFromVersion(ctx, "", version, "source=agent, derived-from=/etc/lsb_release");

SysOSVersionMinorPutFromVersion(ctx, "", version, "source=agent, derived-from-file=/etc/lsb_release");

olehermanse

Looks like it's still failing on some platforms, AIX 7.1 at least; https://ci.cfengine.com/job/testing-pr/label=PACKAGES_ppc64_aix_71/2892/testReport/junit/._01_vars_01_basic_os_version_minor/cf/os_version_minor_cf/

victormlg requested a review from larsewi April 23, 2025 09:57

olehermanse added the after-release label Apr 23, 2025

github-actions bot added the stale Pull requests with no recent activity label May 26, 2025

larsewi reviewed May 27, 2025

View reviewed changes

libenv/sysinfo.c Outdated Show resolved Hide resolved

libenv/sysinfo.c Outdated Show resolved Hide resolved

larsewi requested changes May 27, 2025

View reviewed changes

libenv/sysinfo.c Outdated Show resolved Hide resolved

github-actions bot removed the stale Pull requests with no recent activity label May 27, 2025

victormlg force-pushed the os_version_minor branch from e9cb703 to e57cbe7 Compare June 10, 2025 11:53

larsewi removed the after-release label Jun 10, 2025

victormlg force-pushed the os_version_minor branch 2 times, most recently from b01c5ad to 77e6a40 Compare June 10, 2025 14:40

victormlg requested a review from larsewi June 10, 2025 15:06

victormlg force-pushed the os_version_minor branch from 77e6a40 to d7df578 Compare June 10, 2025 15:08

larsewi requested a review from jakub-nt June 11, 2025 07:16

larsewi requested changes Jun 11, 2025

View reviewed changes

libenv/sysinfo.c Outdated Show resolved Hide resolved

libenv/sysinfo.c Outdated Show resolved Hide resolved

libenv/sysinfo.c Outdated Show resolved Hide resolved

victormlg force-pushed the os_version_minor branch from d7df578 to dcc3edc Compare June 12, 2025 09:35

victormlg force-pushed the os_version_minor branch from dcc3edc to 6001b97 Compare June 24, 2025 12:51

olehermanse requested a review from larsewi June 24, 2025 13:50

victormlg requested a review from olehermanse June 24, 2025 14:29

larsewi requested changes Jun 26, 2025

View reviewed changes

victormlg force-pushed the os_version_minor branch from 6001b97 to 57a45b8 Compare June 26, 2025 14:13

olehermanse requested a review from larsewi June 26, 2025 17:01

larsewi approved these changes Jun 27, 2025

View reviewed changes

larsewi requested changes Jun 30, 2025

View reviewed changes

victormlg force-pushed the os_version_minor branch from a2b616f to 728ed3c Compare July 7, 2025 12:45

github-advanced-security bot found potential problems Jul 7, 2025

View reviewed changes

libenv/sysinfo.c Fixed Show fixed Hide fixed

libenv/sysinfo.c Fixed Show fixed Hide fixed

victormlg force-pushed the os_version_minor branch 4 times, most recently from 2987a78 to 4e33700 Compare July 8, 2025 11:14

victormlg force-pushed the os_version_minor branch from 4e33700 to d38db29 Compare July 14, 2025 10:53

github-advanced-security bot found potential problems Jul 14, 2025

View reviewed changes

libenv/sysinfo.c Fixed Show fixed Hide fixed

victormlg force-pushed the os_version_minor branch 3 times, most recently from 61ad8c2 to 6a55210 Compare July 14, 2025 12:46

victormlg requested a review from larsewi July 14, 2025 16:53

victormlg force-pushed the os_version_minor branch from 6a55210 to 26986ad Compare July 15, 2025 08:25

victormlg added 2 commits July 15, 2025 11:20

Added os_version_minor sys variable

9d97d6e

Ticket: ENT-8118 Signed-off-by: Victor Moene <victor.moene@northern.tech>

Added tests for os_version_minor

55edd2e

Signed-off-by: Victor Moene <victor.moene@northern.tech>

victormlg force-pushed the os_version_minor branch from 26986ad to 55edd2e Compare July 15, 2025 09:20

olehermanse reviewed Jul 15, 2025

View reviewed changes

olehermanse requested changes Jul 15, 2025

View reviewed changes

	SysOSVersionMinorPutFromVersion(ctx, "", version, "source=agent, derived-from=/etc/lsb_release");
	SysOSVersionMinorPutFromVersion(ctx, "", version, "source=agent, derived-from-file=/etc/lsb_release");

ENT-8118: Added os_version_minor sys variable #5777

Are you sure you want to change the base?

ENT-8118: Added os_version_minor sys variable #5777

Conversation

victormlg commented Apr 23, 2025

Uh oh!

github-actions bot commented May 26, 2025

Uh oh!

larsewi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

larsewi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

victormlg commented Jun 13, 2025

Uh oh!

cf-bottom commented Jun 13, 2025

Uh oh!

larsewi commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

victormlg commented Jun 24, 2025

Uh oh!

olehermanse commented Jun 25, 2025

Uh oh!

larsewi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

larsewi left a comment

Choose a reason for hiding this comment

Uh oh!

larsewi commented Jun 27, 2025

Uh oh!

cf-bottom commented Jun 27, 2025

Uh oh!

larsewi left a comment

Choose a reason for hiding this comment

Uh oh!

victormlg commented Jul 7, 2025

Uh oh!

cf-bottom commented Jul 7, 2025

Uh oh!

victormlg commented Jul 7, 2025

Uh oh!

cf-bottom commented Jul 7, 2025

Uh oh!

Uh oh!

Uh oh!

victormlg commented Jul 8, 2025

Uh oh!

cf-bottom commented Jul 8, 2025

Uh oh!

Uh oh!

victormlg commented Jul 14, 2025

Uh oh!

cf-bottom commented Jul 14, 2025

Uh oh!

victormlg commented Jul 15, 2025

Uh oh!

cf-bottom commented Jul 15, 2025

Uh oh!

olehermanse Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

olehermanse Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

larsewi commented Jun 24, 2025 •

edited

Loading