Skip to content

Commit 4b938f0

Browse files
committed
remove ec2-user and run root
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent db8964d commit 4b938f0

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.github/workflows/mac-test.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ jobs:
119119
120120
# Check finch version with HOME set to ec2-user's home
121121
echo "Checking finch version..."
122-
if ! su ec2-user -c 'HOME=/Users/ec2-user finch version'; then
122+
if ! su ec2-user -c 'finch version'; then
123123
echo "finch version command failed, starting VM..."
124-
su ec2-user -c 'HOME=/Users/ec2-user finch vm init'
124+
su ec2-user -c 'finch vm start'
125125
fi
126126
shell: bash
127127

@@ -146,14 +146,14 @@ jobs:
146146
# Run e2e tests inside the Finch VM
147147
- name: Run e2e tests
148148
run: |
149-
echo "Running e2e tests as ec2-user..."
150-
su ec2-user -c "cd ${{ github.workspace }} && STATIC=1 GOPROXY=direct GOOS=linux GOARCH=$(GOARCH) make"
151-
su ec2-user -c 'HOME=/Users/ec2-user finch vm stop'
152-
su ec2-user -c 'HOME=/Users/ec2-user finch vm remove'
153-
154-
su ec2-user -c "cp ${{ github.workspace }}/bin/finch-daemon -f /Applications/Finch/finch-daemon/finch-daemon"
155-
su ec2-user -c 'HOME=/Users/ec2-user finch vm init'
156-
su ec2-user -c make test-e2e-inside-vm
149+
echo "Running e2e tests as root-user..."
150+
su ec2-user -c 'cd ${{ github.workspace }} && STATIC=1 GOPROXY=direct GOOS=linux GOARCH=$(GOARCH) make'
151+
su ec2-user -c 'finch vm stop'
152+
su ec2-user -c 'finch vm remove'
153+
154+
cp ${{ github.workspace }}/bin/finch-daemon -f /Applications/Finch/finch-daemon/finch-daemon
155+
su ec2-user -c 'finch vm init'
156+
su ec2-user -c 'make test-e2e-inside-vm'
157157
shell: bash
158158

159159
# Cleanup

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ DAEMON_DOCKER_HOST := "unix:///Applications/Finch/lima/data/finch/sock/finch.soc
151151

152152
.PHONY: test-e2e-inside-vm
153153
test-e2e-inside-vm: macos
154-
STATIC=1 GOPROXY=direct GOOS=linux GOARCH=$(GOARCH) make && \
155154
DOCKER_HOST=$(DAEMON_DOCKER_HOST) \
156155
DOCKER_API_VERSION="v1.41" \
157156
TEST_E2E=1 \

0 commit comments

Comments
 (0)