Skip to content

Commit 2d19fa0

Browse files
authored
test(e2e): CMP test fails locally on Mac (#25901)
Signed-off-by: Alexandre Gaudreault <[email protected]>
1 parent ee1bf89 commit 2d19fa0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3-
FILE=$(echo "$GIT_SSH_COMMAND" | grep -oP '\-i \K[/\w]+')
3+
# Extract the file path after -i from GIT_SSH_COMMAND
4+
FILE=$(echo "$GIT_SSH_COMMAND" | sed -n 's/.*-i \([^ ]*\).*/\1/p')
45
GIT_SSH_CRED_FILE_SHA=$(sha256sum "${FILE}")
56
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\"}}}"
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
set -e
3-
FILE=$(echo "$GIT_SSH_COMMAND" | grep -oP '\-i \K[/\w]+')
3+
# Extract the file path after -i from GIT_SSH_COMMAND
4+
FILE=$(echo "$GIT_SSH_COMMAND" | sed -n 's/.*-i \([^ ]*\).*/\1/p')
45
GIT_SSH_CRED_FILE_SHA=$(sha256sum "${FILE}")
56
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\"}}}"

0 commit comments

Comments
 (0)