From 0a7d845ea64bf85363f1ce58229223bb0f9ac0d1 Mon Sep 17 00:00:00 2001
From: Felix Gerking <felix.gerking@garz-fricke.com>
Date: Thu, 31 Mar 2022 11:20:25 +0200
Subject: [PATCH] mainfest-CI:package_release: Increase timeout for ftp upload
Added additional log output for sdk upload.
---
manifest-build.yml | 2 ++
manifest.yml | 1 +
package_release.py | 4 ++++
3 files changed, 7 insertions(+)
diff --git a/manifest-build.yml b/manifest-build.yml
index 7ee45351..52c22fde 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -144,7 +144,9 @@ variables:
$UPLOAD_PARAM
fi
# SDK if available
+ echo "Check for SDK to upload"
if [ -d "${ARTIFACTS_SDK_PATH}" ];then
+ echo "SDK path exists, call package_release.py"
$script \
--sdk-dir=${ARTIFACTS_SDK_PATH} \
--outputdir-local="${outdir}"
diff --git a/manifest.yml b/manifest.yml
index b62b44db..3e1cb658 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -251,6 +251,7 @@ build:merge_request:
allow_failure: true
script:
- echo
+ timeout: 30m
.uploadsdkftp:
variables:
diff --git a/package_release.py b/package_release.py
index 6b3b4eec..79670b91 100755
--- a/package_release.py
+++ b/package_release.py
@@ -226,12 +226,16 @@ def main():
# Handle SDK if available
if args.sdk_dir is not None:
sdkfiles = glob.glob(os.path.join(args.sdk_dir, sdkname + "*"))
+ print("package_release.py: Upload the following sdk files:")
+ print(sdkfiles)
sdk_md5sums = copy_files(
sdkfiles, "", os.path.join(machine, "sdk"), None, outlocal_dir
)
write_md5sums_file(
sdk_md5sums, os.path.join(machine, "sdk"), None, outlocal_dir
)
+ else:
+ print("package_release.py: sdk_dir is not specified")
# Store pathes and other stuff in environment variable file
with open("package.env", "w", encoding="utf-8") as env_file:
--
GitLab