Merge remote-tracking branch 'origin/main' into feat/stack_pinot_noir

ci/stack_env.sh

@@ -45,12 +45,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