Skip to content

Commit 7578fbc

Browse files
committed
Switched to ghcr container 'wolfboot-ci' for m33mu tests
1 parent 7eec386 commit 7578fbc

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/stm32h563-m33mu-freertos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
stm32h563_m33mu_echo_freertos:
1010
runs-on: ubuntu-latest
1111
container:
12-
image: ghcr.io/danielinux/m33mu-ci:1.8
12+
image: ghcr.io/wolfssl/wolfboot-ci:v1.2
1313
options: --privileged
1414
steps:
1515
- name: Checkout

.github/workflows/stm32h563-m33mu-ssh-tzen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 25
1313
container:
14-
image: ghcr.io/danielinux/m33mu-ci:1.8
14+
image: ghcr.io/wolfssl/wolfboot-ci:v1.2
1515
options: --privileged
1616

1717
steps:
@@ -72,7 +72,7 @@ jobs:
7272
dhcp-leasefile=/tmp/dnsmasq.leases
7373
log-dhcp
7474
CONF
75-
sudo dnsmasq --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
75+
sudo dnsmasq --no-poll --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
7676
7777
sudo m33mu src/port/stm32h563/app.bin \
7878
--cpu stm32h563 --tap:tap0 --uart-stdout --timeout 180 --quit-on-faults \

.github/workflows/stm32h563-m33mu.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 20
1313
container:
14-
image: ghcr.io/danielinux/m33mu-ci:1.8
14+
image: ghcr.io/wolfssl/wolfboot-ci:v1.2
1515
options: --privileged
1616

1717
steps:
@@ -57,7 +57,7 @@ jobs:
5757
dhcp-leasefile=/tmp/dnsmasq.leases
5858
log-dhcp
5959
EOF
60-
sudo dnsmasq --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
60+
sudo dnsmasq --no-poll --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
6161
6262
sudo m33mu src/port/stm32h563/app.bin \
6363
--cpu stm32h563 --tap:tap0 --uart-stdout --timeout 120 \
@@ -114,7 +114,7 @@ jobs:
114114
runs-on: ubuntu-latest
115115
timeout-minutes: 30
116116
container:
117-
image: ghcr.io/danielinux/m33mu-ci:1.8
117+
image: ghcr.io/wolfssl/wolfboot-ci:v1.2
118118
options: --privileged
119119

120120
steps:
@@ -173,7 +173,7 @@ jobs:
173173
dhcp-leasefile=/tmp/dnsmasq.leases
174174
log-dhcp
175175
EOF
176-
sudo dnsmasq --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
176+
sudo dnsmasq --no-poll --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
177177
178178
sudo m33mu src/port/stm32h563/app.bin \
179179
--cpu stm32h563 --tap:tap0 --uart-stdout --timeout 240 \
@@ -323,7 +323,7 @@ jobs:
323323
runs-on: ubuntu-latest
324324
timeout-minutes: 25
325325
container:
326-
image: ghcr.io/danielinux/m33mu-ci:1.8
326+
image: ghcr.io/wolfssl/wolfboot-ci:v1.2
327327
options: --privileged
328328

329329
steps:
@@ -385,7 +385,7 @@ jobs:
385385
dhcp-leasefile=/tmp/dnsmasq.leases
386386
log-dhcp
387387
CONF
388-
sudo dnsmasq --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
388+
sudo dnsmasq --no-poll --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
389389
390390
sudo tcpdump -i tap0 -nn -U -w /tmp/https-test.pcap > /tmp/tcpdump.log 2>&1 &
391391
echo $! > /tmp/tcpdump.pid

tools/scripts/run-m33mu-ci-in-container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ dhcp-range=192.168.12.50,192.168.12.100,255.255.255.0,12h
145145
dhcp-leasefile=/tmp/dnsmasq.leases
146146
log-dhcp
147147
EOF
148-
run_root dnsmasq --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
148+
run_root dnsmasq --no-poll --conf-file=/tmp/dnsmasq.conf --pid-file=/tmp/dnsmasq.pid
149149
}
150150

151151
start_m33mu() {

tools/scripts/run-m33mu-workflow.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7575
repo_root="$(cd "${script_dir}/../.." && pwd)"
7676
workspace_root="$(cd "${repo_root}/.." && pwd)"
7777
repo_name="$(basename "${repo_root}")"
78-
image="${M33MU_CI_IMAGE:-ghcr.io/danielinux/m33mu-ci:1.7}"
78+
image="${M33MU_CI_IMAGE:-ghcr.io/wolfssl/wolfboot-ci:v1.2}"
7979
podman_tty_args=(--rm --privileged --security-opt label=disable)
8080

8181
if [ -t 0 ] && [ -t 1 ]; then

0 commit comments

Comments
 (0)