Skip to content

ENG-4959 After merging the image created is different from the image created for testing which is no longer reachable #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
entgigi wants to merge 3 commits into
base: release/1.4
Choose a base branch
from
Open

ENG-4959 After merging the image created is different from the image created for testing which is no longer reachable #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d57249e
ENG-4959 added different tag for publishing snapshot version after merge
entgigi Jun 8, 2023
81c5d73
ENG-4959 added fix to unit test
entgigi Jun 8, 2023
26c031d
ENG-4959 added unit test
entgigi Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions macro/agnostic/publication.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/agnostic/test_full_pipeline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

#~
Expand Down
3 changes: 3 additions & 0 deletions test/test_misc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down