manifes-ci: Add debug output for sdk upload

manifest-build.yml

@@ -134,6 +134,15 @@ variables:
       [ ! -x "$script" ] && script=".repo/manifests/$script"
       [ ! -x "$script" ] && echo "Failed to find package_release script"
 
+      # DEBUG
+      echo "###### SDK Debug before package release"
+      echo "SDK-PATH: ${ARTIFACTS_SDK_PATH}"
+      echo "LOCALDIR: $LOCALDIR"
+      echo "Environment"
+      printenv
+      echo "ls:"
+      ls -la
+
       # Image if available
       if [ -d "${ARTIFACTS_IMAGE_PATH}" ];then
           $script \
@@ -144,12 +153,22 @@ variables:
               $UPLOAD_PARAM
       fi
       # SDK if available
+      # DEBUG
+      echo "###### SDK Debug after package release without package.env source"
+      echo "SDK-PATH: ${ARTIFACTS_SDK_PATH}"
+      echo "LOCALDIR: $LOCALDIR"
+      [ -e package.env ] && source package.env && echo "Source package.env success"
+
       if [ -d "${ARTIFACTS_SDK_PATH}" ];then
           $script \
               --sdk-dir=${ARTIFACTS_SDK_PATH} \
               --outputdir-local="${outdir}"
       fi
 
+      echo "###### SDK Debug after package release with package.env source"
+      echo "SDK-PATH: ${ARTIFACTS_SDK_PATH}"
+      echo "LOCALDIR: $LOCALDIR"
+
       # Generate AlphaPlan FWR articles if release tag is set
       apscript=".gitlab-ci/alphaplan_fwr.py"
 
@@ -169,6 +188,54 @@ variables:
               --outputdir-upload=release
       fi
 
+.package_debug:
+  variables:
+    CI_PARAM_PACKAGE_FTP: "false"
+  after_script:
+    - |-
+      # Package release files
+      [ -e build.env ] && source build.env
+      BUILDPATH="build-${BUILD_DISTRO}-${BUILD_MACHINE}"
+      [ -z "${ARTIFACTS_IMAGE_PATH}" ] && \
+        ARTIFACTS_IMAGE_PATH="${BUILDPATH}/${IMAGEBASEPATH}/${BUILD_MACHINE}"
+      [ -z "${ARTIFACTS_LICENSES_PATH}" ] && \
+        ARTIFACTS_LICENSES_PATH="${BUILDPATH}/${LICENSESPATH}"
+      [ -z "${ARTIFACTS_SDK_PATH}" ] && \
+        ARTIFACTS_SDK_PATH="${BUILDPATH}/${SDKPATH}"
+
+      if $CI_PARAM_PACKAGE_FTP; then
+          UPLOAD_PARAM="" # don't store as gitlab artifact
+          OUTDIR_BASE="/artifacts-ftp"
+      else
+          UPLOAD_PARAM="--outputdir-upload=release"
+          OUTDIR_BASE="/artifacts"
+      fi
+
+      # If we are on the master branch and a tag is set
+      # we tread it as release
+      if [ -n "$CI_COMMIT_TAG" ];then
+        outdir="${OUTDIR_BASE}-yocto/Releases"
+        [ "${BUILD_DISTRO}" = "guf-fngsystem" ] && \
+          outdir="${OUTDIR_BASE}-fngsystem"
+      else
+        outdir="${OUTDIR_BASE}-yocto/Interne_Releases"
+        [ "${BUILD_DISTRO}" = "guf-fngsystem" ] && \
+          outdir="${OUTDIR_BASE}-fngsystem/CI_Builds"
+      fi
+
+      printenv
+      echo "######## DEBUG: SDKPATH=${ARTIFACTS_SDK_PATH}"
+      echo "######## DEBUG: SDK Upload"
+
+      if [ -d "${ARTIFACTS_SDK_PATH}" ];then
+          echo "Script: $script"
+          echo "--sdk-dir: ${ARTIFACTS_SDK_PATH}"
+          echo "--outputdir-local: ${outdir}"
+      else
+          echo "SDK_PATH does not exist"
+      fi
+      tree ${ARTIFACTS_SDK_PATH}
+
 .prepare_test:
   before_script:
     - *setup_ssh

manifest.yml

@@ -244,10 +244,9 @@ build:merge_request:
     CI_PARAM_PACKAGE_FTP: "true"
   extends:
     - .infrastructure
-    - .package
+    - .package_debug
   rules:
-    - if: $CI_COMMIT_TAG
-      when: manual
+    - when: manual
       allow_failure: true
   script:
     - echo