test(e2e): CMP test fails locally on Mac (cherry-pick #25901 for 3.3) (#26340)

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
This commit is contained in:
argo-cd-cherry-pick-bot[bot]
2026-02-11 12:06:52 +02:00
committed by GitHub
parent c4f0cd3e84
commit 8df5e96981
2 changed files with 4 additions and 2 deletions

View File

@@ -1,5 +1,6 @@
#!/bin/bash
FILE=$(echo "$GIT_SSH_COMMAND" | grep -oP '\-i \K[/\w]+')
# Extract the file path after -i from GIT_SSH_COMMAND
FILE=$(echo "$GIT_SSH_COMMAND" | sed -n 's/.*-i \([^ ]*\).*/\1/p')
GIT_SSH_CRED_FILE_SHA=$(sha256sum "${FILE}")
echo "{\"kind\": \"ConfigMap\", \"apiVersion\": \"v1\", \"metadata\": { \"name\": \"$ARGOCD_APP_NAME\", \"namespace\": \"$ARGOCD_APP_NAMESPACE\", \"annotations\": {\"GitSSHCommand\":\"$GIT_SSH_COMMAND\", \"GitSSHCredsFileSHA\":\"$GIT_SSH_CRED_FILE_SHA\"}}}"

View File

@@ -1,5 +1,6 @@
#!/bin/bash
set -e
FILE=$(echo "$GIT_SSH_COMMAND" | grep -oP '\-i \K[/\w]+')
# Extract the file path after -i from GIT_SSH_COMMAND
FILE=$(echo "$GIT_SSH_COMMAND" | sed -n 's/.*-i \([^ ]*\).*/\1/p')
GIT_SSH_CRED_FILE_SHA=$(sha256sum "${FILE}")
echo "{\"kind\": \"ConfigMap\", \"apiVersion\": \"v1\", \"metadata\": { \"name\": \"$ARGOCD_APP_NAME\", \"namespace\": \"$ARGOCD_APP_NAMESPACE\", \"annotations\": {\"GitSSHCommand\":\"$GIT_SSH_COMMAND\", \"GitSSHCredsFileSHA\":\"$GIT_SSH_CRED_FILE_SHA\"}}}"