I’m testing an update now that introduces a PKG_GITREVCOUNT, similar to the existing GITREVCOUNT support. This counts the number of commits in a package’s PKG_BASE dir in order to calculate a package-independent version number (as opposed to having the same version for all pkgs in a given repo). Like GITREVCOUNT, you can set a TIS_BASE_SRCREV to specify a range of commits, but without it defined, PKG_GITREVCOUNT will count all commits in the history. As well, it will increment the count by one if you have modified files under the package dir, for designer testing.

https://review.opendev.org/#/q/topic:pkg-versioning+(status:open+OR+status:merged)

For example, updating the build_srpm.data files for sysinv, sysinv-agent, and cgts-client to include:

TIS_PATCH_VER=PKG_GITREVCOUNT

results in:

cgts-client-1.0-182.tis.x86_64.rpm

sysinv-1.0-1614.tis.x86_64.rpm

sysinv-agent-1.0-9.tis.x86_64.rpm

Using this should avoid some of the issues we’ve been having, ensuring the version is updated with every commit.

For the kernel repo, we could use the existing GITREVCOUNT mechanism, or introduce a REPO_GITREVCOUNT similar to the above, to auto-version all the packages based on the full repo, rather than package-independent. This would ensure all packages are upversioned together - ie. update the kernel, and all the kernel modules would be upversioned. Unfortunately, the reverse would also be true in that case… update a kernel module, and the kernel would also end up updated. But the benefits may outweigh that con.

From: Miller, Frank [mailto:Frank.Miller@windriver.com]
Sent: Wednesday, May 13, 2020 9:38 AM
To: starlingx-discuss@lists.starlingx.io
Subject: [Starlingx-discuss] Commit freeze lifted; TIS_PATCH_VER needs to be updated

StarlingX Community:

Going forward your commit needs to include updating the TIS_PATCH_VER of a package.  The current implementation of build layering requires the version to be updated for some packages when that package is changed.  Failure to do this could result in an older built version of a package being picked up.  The build team is looking at a way to remove this requirement but for now please ensure your commits include an update to the TIS_PATCH_VER for the package you are changing.

Cores can now allow commits to merge as we have a green sanity from yesterday’s load.  Cores please confirm TIS_PATCH_VER is updated before allowing commits to merge.

Frank

Project Lead for Build