ENT-8118: Added os_version_minor sys variable

[victormlg]

No description provided.

[github-actions]

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.

[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.

[victormlg]

@cf-bottom jenkins, please

[cf-bottom]

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]

Build for Windows (no tests)

Packages here

[victormlg]

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]

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?

[larsewi]

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

[larsewi]

@cf-bottom Jenkins with exotics please :)

[cf-bottom]

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/

[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/

[larsewi]

AIX only

[larsewi]

^ AIX failure is unrelated

[larsewi]

This build includes fix from cfengine/buildscripts#1834

[larsewi]

Great work @victormlg 🚀 Added some smaller comments that you'll need to address.

[larsewi]

AIX only

[larsewi]

@cf-bottom Jenkins with exotics please :)

[cf-bottom]

Alright, I triggered a build:

(with exotics)

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

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

[larsewi]

@cf-bottom Jenkins with exotics please :)

[cf-bottom]

Alright, I triggered a build:

(with exotics)

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

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

[larsewi]

Failed on Solaris 11

R: Defined classes: Afternoon
R: Defined classes: Min32
R: Defined classes: GMT_Tuesday
R: Defined classes: feature_tls_1_0
R: Defined classes: zone_s11_build
R: Defined classes: ipv4_192_168
R: Defined classes: loghost
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: sunos_sun4v_5_11_11_1
R: Defined classes: cfengine_3_27
R: Defined classes: ipv4_192_168_253
R: Defined classes: feature_yaml
R: Defined classes: GMT_Day19
R: Defined classes: s11_build
R: Defined classes: 192_168_253_163
R: Defined classes: error_mode
R: Defined classes: warning_mode
R: Defined classes: GMT_Lcycle_0
R: Defined classes: sunos_5_11
R: Defined classes: Day19
R: Defined classes: Tuesday
R: Defined classes: ipv4_127_0
R: Defined classes: Hr13_Q3
R: Defined classes: sunos_sun4v
R: Defined classes: net_iface_lo0_1
R: Defined classes: cfengine_3
R: Defined classes: 4_cpus
R: Defined classes: GMT_Morning
R: Defined classes: feature_def_json_preparse
R: Defined classes: feature_host_specific_data_load
R: Defined classes: feature_host
R: Defined classes: GMT_August
R: Defined classes: GMT_Min30_35
R: Defined classes: DEBUG
R: Defined classes: GMT_Hr11_Q3
R: Defined classes: feature_host_specific_data
R: Defined classes: feature
R: Defined classes: cfengine
R: Defined classes: 64_bit
R: Defined classes: notice_mode
R: Defined classes: feature_curl
R: Defined classes: feature_tls_1_3
R: Defined classes: feature_tls_1
R: Defined classes: agent
R: Defined classes: cfengine_3_27_0a_aa1825e77
R: Defined classes: ipv4_192_168_253_163
R: Defined classes: 127_0_0_1
R: Defined classes: any
R: Defined classes: feature_copyfrom
R: Defined classes: Hr13
R: Defined classes: feature_copyfrom_restrict
R: Defined classes: net_iface_net0_1
R: Defined classes: sparc
R: Defined classes: ipv4_127_0_0_1
R: Defined classes: cfengine_3_27_0a
R: Defined classes: sun4v
R: Defined classes: ipv4_192
R: Defined classes: feature_xml
R: Defined classes: solaris
R: Defined classes: inform_mode
R: Defined classes: August
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: compiled_on_solaris2_11
R: Defined classes: feature_host_specific
R: Defined classes: GMT_Hr11
R: Defined classes: sunos_sun4v_5_11
R: Defined classes: GMT_Q3
R: Defined classes: feature_pam
R: Defined classes: mac_00_14_4f_f9_9a_c8
R: Defined classes: feature_tls
R: Defined classes: AUTO
R: Defined classes: community_edition
R: Defined classes: ipv4_127
R: Defined classes: Yr2025
R: Defined classes: Q3
R: Defined classes: feature_tls_1_2
R: Defined classes: GMT_Min32
R: /export/home/jenkins/workspace/testing-pr/label/PACKAGES_sparc64_solaris_11/cfengine-3.27.0a.aa1825e77/tests/acceptance/./01_vars/01_basic/os_version_minor.cf Found: Unknown
R: /export/home/jenkins/workspace/testing-pr/label/PACKAGES_sparc64_solaris_11/cfengine-3.27.0a.aa1825e77/tests/acceptance/./01_vars/01_basic/os_version_minor.cf FAIL
R: Version number extracted from class: $(test.os_class)
R: /export/home/jenkins/workspace/testing-pr/label/PACKAGES_sparc64_solaris_11/cfengine-3.27.0a.aa1825e77/tests/acceptance/./01_vars/01_basic/os_version_minor.cf Expected: $(test.expected)

[victormlg]

Merged here: #5861