From 47a0776a2ef5615117d425e9b29adde9f3b6d625 Mon Sep 17 00:00:00 2001
From: Felix Gerking <felix.gerking@garz-fricke.com>
Date: Fri, 4 Mar 2022 16:58:50 +0100
Subject: [PATCH] CI-images:package_release: Fix SDK deployment
The markdown2 Python module was added to the package_release.py script,
which resulted in a failed SDK deployment because it was missing from
the build container. Updated ci-images to the latest revision, in which
the module was added to the build container.
Modified package_release.py to skip the metadata generation when
deploying the SDK.
BCS 746-000727
---
.gitlab-ci.yml | 2 +-
package_release.py | 17 +++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30976b23..3e098dd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@
variables:
# CI_IMAGES_BASEPATH: Environment variable configure in gitlab
CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/ci-images
- CI_IMAGES_REVISION: 835a7096092eef5cecde23fd933209e7a8488637
+ CI_IMAGES_REVISION: 44965ccdd847f1e077670f49d546047f8ad0110c
CI_IMAGE_PYTHON: "${CI_IMAGES_PATH}/python/3.9:${CI_IMAGES_REVISION}"
CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
diff --git a/package_release.py b/package_release.py
index 93d4d5c1..e141bc5f 100755
--- a/package_release.py
+++ b/package_release.py
@@ -302,14 +302,15 @@ def main():
)
# Generate metadata
- generate_metadata(
- machine,
- version,
- artifacts_all,
- sdkname,
- output_dir,
- outlocal_dir,
- )
+ if args.sdk_dir is None:
+ generate_metadata(
+ machine,
+ version,
+ artifacts_all,
+ sdkname,
+ output_dir,
+ outlocal_dir,
+ )
# Handle SDK if available
if args.sdk_dir is not None:
--
GitLab