Merge pull request #5371 from nickanderson/ENT-10832/3.21

ENT-10832: Fixed inventoried policy release id when masterfiles-stage.sh deploys with cfbs (3.21)
cfengine · Nov 9, 2023 · 78594e0 · 78594e0
2 parents e5b4a36 + 2cd30c5
commit 78594e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrib/masterfiles-stage/common.sh b/contrib/masterfiles-stage/common.sh
@@ -222,8 +222,8 @@ git_cfbs_deploy_refspec() {
   # Switch back to the original working dir
   cd "${_start_wrkdir}"
   # Grab HEAD so it can be used to populate cf_promises_release_id
-  mkdir -p "${temp_stage}/.git"
-  cp "${local_mirrored_repo}/HEAD" "${temp_stage}/.git/"
+  mkdir -p "${temp_stage}/out/masterfiles/.git"
+  cp "${local_mirrored_repo}/HEAD" "${temp_stage}/out/masterfiles/.git/"
 
   ########################## 3. SET PERMISSIONS ON POLICY SET
   chown -R root:root "${temp_stage}" || error_exit "Unable to chown '${temp_stage}'"