diff --git a/macro/agnostic/publication.sh b/macro/agnostic/publication.sh index 6c8cd29f..28087c8f 100755 --- a/macro/agnostic/publication.sh +++ b/macro/agnostic/publication.sh @@ -62,6 +62,10 @@ ppl--publication.tag-git-version() { "may be you re-executed an old run?" } + if [ "${snapshotVersionTag:0:1}" = "v" ]; then + snapshotVersionTag="${snapshotVersionTag}-merge" + fi + __git_add_tag -f "$snapshotVersionTag" "$PPL_RUN_ID" "$PPL_COMMIT_ID" __git push origin "$snapshotVersionTag" -f diff --git a/test/agnostic/test_full_pipeline.sh b/test/agnostic/test_full_pipeline.sh index 460a996f..b0dfd9ab 100755 --- a/test/agnostic/test_full_pipeline.sh +++ b/test/agnostic/test_full_pipeline.sh @@ -94,7 +94,7 @@ test_flow_pr_check() { ppl--publication tag-git-version --lcd "local-clone" || _SOE cd local-clone - ASSERT -v SNAPSHOT-TAG "$(git tag | grep "ENG-")" = "v10.9.8.0-ENG-2471-PR-154+BB-develop" + ASSERT -v SNAPSHOT-TAG "$(git tag | grep "ENG-")" = "v10.9.8.0-ENG-2471-PR-154+BB-develop-merge" ) || _SOE #~ diff --git a/test/test_misc.sh b/test/test_misc.sh index 1e31e7b8..d994ec1a 100755 --- a/test/test_misc.sh +++ b/test/test_misc.sh @@ -483,6 +483,9 @@ test__ppl_extract_branch_name_from_ref() { ASSERT RES = "epic/an-epic-branch" _ppl_extract_branch_name_from_ref RES "refs/tags/TEST/v7.0.0-ENG-3002-PR-166" ASSERT RES = "TEST/v7.0.0-ENG-3002-PR-166" + _ppl_extract_branch_name_from_ref RES "refs/tags/v7.0.0-ENG-3002-PR-166+BB-develop" + ASSERT RES = "develop" + } #TEST:lib