Correcting mis named squash_id

.gitlab-ci.yml

@@ -60,7 +60,7 @@ variables:
         SQUASHFS_ID: ${CI_MERGE_REQUEST_IID}
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       variables:
-        SQUASHFS_ID: ${CI_DEFAULT_BRANCH}
+        SQUASHFS_ID: ${CI_COMMIT_BRANCH}
 
 .parallel_job:
   extends:

ci/stack_env.sh

@@ -33,12 +33,13 @@ else
    squash_base=main
 fi
 
+
 if [ "x${CI_MERGE_REQUEST_IID}" != "x" ]
 then
     squash_id=${CI_MERGE_REQUEST_IID}
 elif [ "x${CI_COMMIT_BRANCH}" != "x" ]
 then
-    squash_id=${CI_MERGE_REQUEST_IID}
+    squash_id=${CI_COMMIT_BRANCH}
 else
     squash_id="local"
 fi