Skip to content

Commit dc11d4e

Browse files
committed
Revert QEMU
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent e66a6cd commit dc11d4e

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

.github/workflows/qemu.yml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on: workflow_call
66
permissions:
77
contents: read
88

9-
env:
10-
UMF_DIR: "/home/runner/work/unified-memory-framework/unified-memory-framework"
11-
129
jobs:
1310
qemu-build:
1411
name: Qemu
@@ -47,10 +44,10 @@ jobs:
4744
cat > user-data << EOF
4845
#cloud-config
4946
50-
# Add a 'runner' user to the system with a password
47+
# Add a 'testuser' user to the system with a password
5148
users:
5249
- default
53-
- name: runner
50+
- name: testuser
5451
gecos: Test User
5552
primary_group: wheel
5653
groups: users
@@ -64,7 +61,7 @@ jobs:
6461
chpasswd:
6562
list: |
6663
root:password
67-
runner:password
64+
testuser:password
6865
expire: False
6966
EOF
7067
@@ -85,18 +82,12 @@ jobs:
8582
run: |
8683
umf/scripts/qemu/start_qemu.sh default.xml
8784
88-
ssh [email protected] -p 2222 -t "sudo chown -R runner:users /home/runner"
89-
90-
# Coverage (lcov) has to be run in the same directory on all runners:
91-
# /home/runner/work/unified-memory-framework/unified-memory-framework/build
92-
# so we have to create the same path here.
93-
ssh [email protected] -p 2222 -t "mkdir -p ${{env.UMF_DIR}}"
94-
95-
# Copy UMF repository's content into QEMU.
96-
rsync -az -e "ssh -p 2222" ${{github.workspace}}/umf/ [email protected]:${{env.UMF_DIR}}/
85+
# Copy UMF repository's content into the home dir in QEMU
86+
rsync -az -e "ssh -p 2222" ${{github.workspace}}/umf/ [email protected]:/home/testuser/
87+
ssh [email protected] -p 2222 -t "sudo chown -R testuser:users /home/testuser"
9788
98-
ssh runner@127.0.0.1 -p 2222 -t "bash ${{env.UMF_DIR}}/scripts/qemu/run-build.sh COVERAGE"
99-
ssh runner@127.0.0.1 -p 2222 -t "sudo shutdown -h now"
89+
ssh testuser@127.0.0.1 -p 2222 -t "bash /home/testuser/scripts/qemu/run-build.sh COVERAGE"
90+
ssh testuser@127.0.0.1 -p 2222 -t "sudo shutdown -h now"
10091
10192
- name: Run tests in QEMU
10293
run: |
@@ -111,9 +102,9 @@ jobs:
111102
echo "\n ### Testing ${config_name} ###"
112103
umf/scripts/qemu/start_qemu.sh ${config_name}
113104
114-
ssh runner@127.0.0.1 -p 2222 -t "bash ${{env.UMF_DIR}}/scripts/qemu/run-tests.sh COVERAGE ${config_name}"
115-
scp -r -P 2222 runner@127.0.0.1:/home/runner/coverage ./
116-
ssh runner@127.0.0.1 -p 2222 -t "sudo shutdown -h now"
105+
ssh testuser@127.0.0.1 -p 2222 -t "bash /home/testuser/scripts/qemu/run-tests.sh COVERAGE ${config_name}"
106+
scp -r -P 2222 testuser@127.0.0.1:/home/testuser/coverage ./
107+
ssh testuser@127.0.0.1 -p 2222 -t "sudo shutdown -h now"
117108
done
118109
ls -al ./coverage
119110

0 commit comments

Comments
 (0)