diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2021-03-29 08:00:20 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-03-29 10:50:25 +0000 |
| commit | dcf30cda44e0af7e4f81fd8c8a4dcdefb73020fe (patch) | |
| tree | ffb88536ea7aadddbe5e0e9d63133b32908843fc | |
| parent | d3317ef77944d230c907929bf9e6d18aff173f8a (diff) | |
SPEC-3414: handle all git_describe variance
git_describe is equal to branch but only in LAVA metadata.
For build meta is should be the same as LAVA kernel.version.
So let's add a --kernel_version (not mandatory until all CI is updated)
Change-Id: Ifa4d4065cc2a7e0687bb71b0b772b5d10f4c41f6
Bug-AGL: SPEC-3414
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
(cherry picked from commit d3c142f5da3e6671e7fed3da0fff78ecfb5e9210)
| -rwxr-xr-x | utils/agl-publish.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/utils/agl-publish.py b/utils/agl-publish.py index e2e50fc..3bbf8e6 100755 --- a/utils/agl-publish.py +++ b/utils/agl-publish.py @@ -12,6 +12,7 @@ parser.add_argument('--arch', action='store', help="arch of the build", required parser.add_argument('--branch', action='store', help="branch of the build", required=True) parser.add_argument('--commit', action='store', help="commit of the build", required=True) parser.add_argument('--build_version', action='store', help="build_version of the build", required=True) +parser.add_argument('--kernel_version', action='store', help="kernel_version of the build", default=None) parser.add_argument('--machine', action='store', help="machine of the build", required=True) parser.add_argument('--api', action='store', help="URL to kernelci backend API", required=True) args = parser.parse_args() @@ -43,7 +44,10 @@ bmeta["defconfig_full"] = "defconfig+CONFIG_AGL=y" bmeta["git_branch"] = args.branch bmeta["git_commit"] = args.commit -bmeta["git_describe"] = args.branch +if args.kernel_version: + bmeta["git_describe"] = args.kernel_version +else: + bmeta["git_describe"] = args.branch bmeta["job"] = "AGL-yocto" fsr = "AGL-yocto/%s/%s/%s/" % (args.branch, args.build_version, args.machine) |