Skip to content

Commit e87ee5e

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

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/mac-test.yaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,13 @@ jobs:
116116
chown -R root:wheel /private/var/run
117117
mkdir -p /private/var/run/finch-lima
118118
chown -R root:wheel /private/var/run/finch-lima
119+
chmod -R 775 /private/var/run/finch-lima
119120
120121
# Check finch version with HOME set to ec2-user's home
121122
echo "Checking finch version..."
122-
if ! su ec2-user -c 'HOME=/Users/ec2-user finch version'; then
123+
if ! su ec2-user -c 'finch version'; then
123124
echo "finch version command failed, starting VM..."
124-
su ec2-user -c 'HOME=/Users/ec2-user finch vm init'
125+
su ec2-user -c 'finch vm start'
125126
fi
126127
shell: bash
127128

@@ -146,14 +147,14 @@ jobs:
146147
# Run e2e tests inside the Finch VM
147148
- name: Run e2e tests
148149
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
150+
echo "Running e2e tests as root-user..."
151+
su ec2-user -c 'cd ${{ github.workspace }} && STATIC=1 GOPROXY=direct GOOS=linux GOARCH=$(GOARCH) make'
152+
su ec2-user -c 'finch vm stop'
153+
su ec2-user -c 'finch vm remove'
154+
155+
cp ${{ github.workspace }}/bin/finch-daemon -f /Applications/Finch/finch-daemon/finch-daemon
156+
su ec2-user -c 'finch vm init'
157+
su ec2-user -c 'make test-e2e-inside-vm'
157158
shell: bash
158159

159160
# 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)