cicd: fix the package creation script

cicd/stages/build.yml

@@ -18,12 +18,12 @@ build-android:
   variables:
     QDS_CI_JOB_BUILD_PATH: "${QDS_CI_CACHE_PATH}/${QDS_CI_JOB_TARGET_ARCH}/build"
     QDS_CI_JOB_TARGET_PLATFORM: "android"
-    QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_PLATFORM}/${QDS_CI_JOB_TARGET_ARCH}
+    QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_ARCH}
     QDS_CI_JOB_ARTIFACTS_PATH_APP: ${QDS_CI_JOB_ARTIFACTS_PATH}/app
     QDS_CI_JOB_ARTIFACTS_PATH_TEST: ${QDS_CI_JOB_ARTIFACTS_PATH}/test
-    QDS_CI_JOB_QT_ANDROID_PATH: "${QDS_CI_QT_PATH}/${QDS_CI_QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}"
+    QDS_CI_JOB_QT_ANDROID_PATH: "${DOCKER_ENV_QT_PATH_WITH_VERSION}/android_${QDS_CI_JOB_TARGET_ARCH}"
   artifacts:
-    name: design-viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_PLATFORM}-${QDS_CI_JOB_TARGET_ARCH}
+    name: qt_ui_viewer-${CI_JOB_ID}-qt${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_ARCH}
     expose_as: "build-artifacts"
     paths:
       - ${QDS_CI_ARTIFACTS_PATH}
@@ -37,7 +37,7 @@ build-android:
       -S . \
       -G Ninja \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/lib/cmake/Qt6/qt.toolchain.cmake \
+      -DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_ANDROID_PATH}/lib/cmake/Qt6/qt.toolchain.cmake \
       -DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
       -DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
       -DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
@@ -51,7 +51,7 @@ build-android:
       -B ${QDS_CI_JOB_BUILD_PATH} \
       -G Ninja \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WITH_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/lib/cmake/Qt6/qt.toolchain.cmake \
+      -DCMAKE_TOOLCHAIN_FILE=${QDS_CI_JOB_QT_ANDROID_PATH}/lib/cmake/Qt6/qt.toolchain.cmake \
       -DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
       -DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
       -DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \

cicd/stages/release.yml

@@ -12,7 +12,8 @@ create-packages:
     QDS_PACKAGE_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/qt-ui-viewer/${CI_COMMIT_TAG}"
   script:
     - apk add tar curl
-    - cd ${QDS_CI_ARTIFACTS_PATH_APP}
+    - echo ${QDS_CI_ARTIFACTS_PATH}; ls -l ${QDS_CI_ARTIFACTS_PATH}
+    - cd ${QDS_CI_ARTIFACTS_PATH}
     - |
       for platform in $(ls); do
         echo "Creating packages for platform $platform"