Skip to content

Commit 7492698

Browse files
committed
Using DHCP mode for client rather then fixed, adjust README
1 parent 0b9fc29 commit 7492698

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

.github/workflows/usb-wireless-autotest.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,7 @@ jobs:
6868
shell: bash
6969
run: |
7070
71-
# determine the access point name
72-
# based on the device class
73-
# AX - 6GHz
74-
# AC600 - 5GHz
75-
# AC - 2.4GHz
76-
case "${{ matrix.json.device_class }}" in
77-
AX) ACCESS_POINT="GOSTJE60" ;;
78-
AC600) ACCESS_POINT="GOSTJE50" ;;
79-
*) ACCESS_POINT="GOSTJE24" ;;
80-
esac
71+
ACCESS_POINT="GOSTJE60"
8172
8273
# generate the YAML file
8374
# for the wireless device
@@ -92,14 +83,8 @@ jobs:
9283
renderer: networkd
9384
wifis:
9485
${{ env.DEVICE }}:
95-
addresses:
96-
- "10.0.50.50/24"
97-
nameservers:
98-
addresses:
99-
- 9.9.9.9
100-
- 1.1.1.1
101-
dhcp4: false
102-
dhcp6: false
86+
dhcp4: true
87+
dhcp6: true
10388
macaddress: "${{ matrix.json.serial }}"
10489
access-points:
10590
"${ACCESS_POINT}":
@@ -125,18 +110,21 @@ jobs:
125110
while true; do
126111
# nmcli -t -f NAME connection show --active | grep ${DEVICE}
127112
CONNECTION=$(ssh ci@${{ env.IP_ADDR }} "networkctl | grep ${{ env.DEVICE }} | grep routable || true")
128-
if [[ -n "${CONNECTION}" ]]; then
113+
CLIENTIP=$(ssh ci@${{ env.IP_ADDR }} "ip -4 addr show ${{ env.DEVICE }} | grep -oP '(?<=inet\s)\d+(\.\d+){3}' || true")
114+
# check if the connection is routable
115+
if [[ -n "${CONNECTION}" && -n "${CLIENTIP}" ]]; then
129116
break
130117
fi
131118
sleep 2
132119
done
120+
echo "CLIENTIP=${CLIENTIP}" >> $GITHUB_ENV
133121
134122
- name: "Do some perf testing"
135123
shell: bash
136124
run: |
137125
138126
mkdir -p test
139-
numbers=$(ssh ci@${{ env.IP_ADDR }} "iperf3 -R -c 10.0.60.10 -B 10.0.50.50 -t 5 -J | jq '.intervals[] .sum .bits_per_second' | LC_ALL=C datamash median 1 | cut -d"-" -f2")
127+
numbers=$(ssh ci@${{ env.IP_ADDR }} "iperf3 -R -c 10.0.60.10 -B ${{ env.CLIENTIP }} -t 5 -J | jq '.intervals[] .sum .bits_per_second' | LC_ALL=C datamash median 1 | cut -d"-" -f2")
140128
mbits=$(echo $numbers | LC_ALL=C awk '{$1/=1048576;printf "%.0f Mbps\n",$1}')
141129
echo "|${{ matrix.json.name }}|${{ matrix.json.device_type }}| ${{ matrix.json.serial }} | ${{ matrix.json.device_class }} | ${mbits} |" > test/ci@${{ env.DEVICE }}.iperf
142130

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ It prepares several data exchange files.
2020
| Compare all mirrors content and generate redirector configs | <a href=https://github.com/armbian/armbian.github.io/actions/workflows/generate-redirector-config.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/armbian.github.io/generate-redirector-config.yml?logo=githubactions&label=Status&style=for-the-badge&branch=main"></a> |
2121
| Update download JSON index|<a href=https://github.com/armbian/armbian.github.io/actions/workflows/generate-web-index.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/armbian.github.io/generate-web-index.yml?logo=githubactions&label=Status&style=for-the-badge&branch=main"></a>|
2222
| Pull excerpts from Armbian Jira|<a href=https://github.com/armbian/armbian.github.io/actions/workflows/generate-jira-excerpt.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/armbian.github.io/generate-jira-excerpt.yml?logo=githubactions&label=Status&style=for-the-badge&branch=main"></a>|
23-
| USB wireless performance testig |<a href=https://github.com/armbian/armbian.github.io/actions/workflows/usb-wireless-autotest.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/armbian.github.io/usb-wireless-autotest.yml?logo=githubactions&label=Status&style=for-the-badge&branch=main"></a>|
23+
| Wireless performance testig |<a href=https://github.com/armbian/armbian.github.io/actions/workflows/usb-wireless-autotest.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/armbian.github.io/usb-wireless-autotest.yml?logo=githubactions&label=Status&style=for-the-badge&branch=main"></a>|
2424
| Mirror repository artifacts to our CDN |<a href=https://github.com/armbian/armbian.github.io/actions/workflows/mirror.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/armbian.github.io/mirror.yml?logo=githubactions&label=Status&style=for-the-badge&branch=main"></a>|

0 commit comments

Comments
 (0)