diff --git a/.github/workflows/bins.yaml b/.github/workflows/bins.yaml index 57f8d2ed6..c955840f7 100644 --- a/.github/workflows/bins.yaml +++ b/.github/workflows/bins.yaml @@ -125,12 +125,6 @@ jobs: package: misc secrets: token: ${{ secrets.HUB_JWT }} - iperf: - uses: ./.github/workflows/bin-package.yaml - with: - package: iperf - secrets: - token: ${{ secrets.HUB_JWT }} cpubench: uses: ./.github/workflows/bin-package.yaml with: diff --git a/bins/packages/iperf/iperf.sh b/bins/packages/iperf/iperf.sh deleted file mode 100644 index 2ffddf0d6..000000000 --- a/bins/packages/iperf/iperf.sh +++ /dev/null @@ -1,33 +0,0 @@ -IPERF_VERSION="3.19.1" -IPERF_CHECKSUM="967de64f73d2884b8a1d82b2b83a27d7" -IPERF_LINK="https://github.com/userdocs/iperf3-static/releases/download/${IPERF_VERSION}/iperf3-amd64" - -download_iperf() { - echo "downloading iperf" - download_file ${IPERF_LINK} ${IPERF_CHECKSUM} iperf-${IPERF_VERSION} -} - - -prepare_iperf() { - echo "[+] prepare iperf" - github_name "iperf-${IPERF_VERSION}" -} - -install_iperf() { - echo "[+] install iperf" - - mkdir -p "${ROOTDIR}/usr/bin" - - cp ${DISTDIR}/iperf-${IPERF_VERSION} ${ROOTDIR}/usr/bin/iperf - chmod +x ${ROOTDIR}/usr/bin/* -} - -build_iperf() { - pushd "${DISTDIR}" - - download_iperf - prepare_iperf - install_iperf - - popd -} diff --git a/cmds/modules/noded/main.go b/cmds/modules/noded/main.go index 3aca8c9b8..d38ffe353 100644 --- a/cmds/modules/noded/main.go +++ b/cmds/modules/noded/main.go @@ -20,8 +20,8 @@ import ( "github.com/threefoldtech/zosbase/pkg/perf" "github.com/threefoldtech/zosbase/pkg/perf/cpubench" "github.com/threefoldtech/zosbase/pkg/perf/healthcheck" - "github.com/threefoldtech/zosbase/pkg/perf/iperf" "github.com/threefoldtech/zosbase/pkg/perf/publicip" + "github.com/threefoldtech/zosbase/pkg/perf/speedtest" "github.com/threefoldtech/zosbase/pkg/registrar" "github.com/threefoldtech/zosbase/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/utils" @@ -174,7 +174,7 @@ func action(cli *cli.Context) error { } ctx = perf.WithZbusClient(ctx, zcl) healthcheck.RunNTPCheck(ctx) - perfMon.AddTask(iperf.NewTask()) + perfMon.AddTask(speedtest.NewTask()) perfMon.AddTask(cpubench.NewTask()) perfMon.AddTask(publicip.NewTask()) perfMon.AddTask(healthcheck.NewTask()) diff --git a/go.mod b/go.mod index f41c0e34a..0eda9b4bf 100644 --- a/go.mod +++ b/go.mod @@ -134,6 +134,7 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0 // indirect + github.com/showwin/speedtest-go v1.7.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect @@ -170,3 +171,5 @@ require ( ) replace github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible + +replace github.com/threefoldtech/zosbase => ../zosbase diff --git a/go.sum b/go.sum index 933c60df0..019ecd25e 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,8 @@ github.com/ethereum/go-ethereum v1.11.6 h1:2VF8Mf7XiSUfmoNOy3D+ocfl9Qu8baQBrCNbo github.com/ethereum/go-ethereum v1.11.6/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= @@ -517,6 +517,8 @@ github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0/go.mod h1:Z0q5wiB github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/showwin/speedtest-go v1.7.10 h1:9o5zb7KsuzZKn+IE2//z5btLKJ870JwO6ETayUkqRFw= +github.com/showwin/speedtest-go v1.7.10/go.mod h1:Ei7OCTmNPdWofMadzcfgq1rUO7mvJy9Jycj//G7vyfA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -562,8 +564,6 @@ github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.5 h1:zp5iZOvtvcQrcR7Po3U github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.5/go.mod h1:T+PZydVl3fxywqoUhCmzs+hUarfE1q9IMRl9xa+GIYo= github.com/threefoldtech/zbus v1.0.1 h1:3KaEpyOiDYAw+lrAyoQUGIvY9BcjVRXlQ1beBRqhRNk= github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo= -github.com/threefoldtech/zosbase v1.0.5 h1:PbxtWmleDpCUFUZRxKcuPjcrQNLaPgz00Y9OU0sUmSk= -github.com/threefoldtech/zosbase v1.0.5/go.mod h1:ZZ1M8SZVr7k4tH2URr5DMEbcwZoQDpBZWgboHdiNE+k= github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=