Skip to content

tests: fix git cve fix breakage #280

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

Merged
merged 1 commit into from
Apr 20, 2022
Merged

tests: fix git cve fix breakage #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions test/basic.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ EOF

publishedGitVersion=$(cat oci/blobs/sha256/$manifest | jq -r '.annotations."com.cisco.stacker.git_version"')
# ci does not clone tags. There it tests the fallback-to-commit path.
myGitVersion=$(git describe --tags) || myGitVersion=$(git rev-parse HEAD)
[ -n "$(git status --porcelain --untracked-files=no)" ] &&
myGitVersion=$(run_git describe --tags) || myGitVersion=$(run_git rev-parse HEAD)
[ -n "$(run_git status --porcelain --untracked-files=no)" ] &&
dirty="-dirty" || dirty=""
[ "$publishedGitVersion" = "$myGitVersion$dirty" ]

Expand Down
6 changes: 5 additions & 1 deletion test/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
ROOT_DIR=$(git rev-parse --show-toplevel)
function run_git {
sudo -u $SUDO_USER git "$@"
}

ROOT_DIR=$(run_git rev-parse --show-toplevel)
if [ "$(id -u)" != "0" ]; then
echo "you should be root to run this suite"
exit 1
Expand Down