Skip to content

bump zosbase@v1.0.10 to include the new provisiontest #2690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Omarabdul3ziz merged 3 commits into from
Mar 31, 2026
Merged

bump zosbase@v1.0.10 to include the new provisiontest #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc0dca6
bump zosbase@v1.0.10 to include the new provisiontest
Omarabdul3ziz Mar 31, 2026
031a129
fix virtwhat build: use official release tarball instead of broken gi…
Omarabdul3ziz Mar 31, 2026
54a8010
restore old build script
Omarabdul3ziz Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions bins/packages/virtwhat/virtwhat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
VIRTWHAT_VERSION="1.27-1"
VIRTWHAT_CHECKSUM="7ce5ae03f93aef3be3161a0f3ee8d26a"
VIRTWHAT_LINK="https://github.com/deepin-community/virt-what/archive/refs/tags/${VIRTWHAT_VERSION}.tar.gz"
VIRTWHAT_VERSION="1.27"
VIRTWHAT_CHECKSUM="0d392f4623fe747400b0a14c0942e2ec"
VIRTWHAT_LINK="https://people.redhat.com/~rjones/virt-what/files/virt-what-${VIRTWHAT_VERSION}.tar.gz"

download_virtwhat() {
download_file ${VIRTWHAT_LINK} ${VIRTWHAT_CHECKSUM} virt-what-${VIRTWHAT_VERSION}.tar.gz
download_file ${VIRTWHAT_LINK} ${VIRTWHAT_CHECKSUM} "virt-what-${VIRTWHAT_VERSION}.tar.gz"
}

extract_virtwhat() {
echo "[+] extracting virt-what"

rm -rf ${WORKDIR}/*
tar -xf ${DISTDIR}/virt-what-${VIRTWHAT_VERSION}.tar.gz -C ${WORKDIR}
}

Expand All @@ -20,25 +17,25 @@ prepare_virtwhat() {

compile_virtwhat() {
echo "[+] compile virt-what"
pushd ${WORKDIR}/virt-what-${VIRTWHAT_VERSION}
autoreconf -i
autoconf
./configure
make

echo "[+] building virt-what images"
popd
}

install_virtwhat() {
echo "[+] install virt-what"

mkdir -p "${ROOTDIR}/usr/bin"
cp virt-what ${ROOTDIR}/usr/bin/virt-what
cp virt-what-cpuid-helper ${ROOTDIR}/usr/bin/virt-what-cpuid-helper


cp ${WORKDIR}/virt-what-${VIRTWHAT_VERSION}/virt-what ${ROOTDIR}/usr/bin/virt-what
cp ${WORKDIR}/virt-what-${VIRTWHAT_VERSION}/virt-what-cpuid-helper ${ROOTDIR}/usr/bin/virt-what-cpuid-helper

chmod +x ${ROOTDIR}/usr/bin/virt-what
chmod +x ${ROOTDIR}/usr/bin/virt-what-cpuid-helper

echo "[+] install virt-what images"
}

build_virtwhat() {
Expand All @@ -48,11 +45,11 @@ build_virtwhat() {
extract_virtwhat

popd
pushd ${WORKDIR}/virt-what-${VIRTWHAT_VERSION}
pushd ${WORKDIR}

prepare_virtwhat
compile_virtwhat
install_virtwhat

popd
}
}
2 changes: 2 additions & 0 deletions cmds/modules/noded/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"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/provisiontest"
"github.com/threefoldtech/zosbase/pkg/perf/publicip"
"github.com/threefoldtech/zosbase/pkg/registrar"
"github.com/threefoldtech/zosbase/pkg/stubs"
Expand Down Expand Up @@ -178,6 +179,7 @@ func action(cli *cli.Context) error {
perfMon.AddTask(cpubench.NewTask())
perfMon.AddTask(publicip.NewTask())
perfMon.AddTask(healthcheck.NewTask())
perfMon.AddTask(provisiontest.NewTask())

if err = perfMon.Run(ctx); err != nil {
return errors.Wrap(err, "failed to run the scheduler")
Expand Down
62 changes: 32 additions & 30 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ require (
github.com/blang/semver v3.5.1+incompatible
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cenkalti/backoff/v3 v3.2.2
github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12
github.com/centrifuge/go-substrate-rpc-client/v4 v4.2.1
github.com/gizak/termui/v3 v3.1.0
github.com/go-redis/redis v6.15.9+incompatible
github.com/joncrlsn/dque v0.0.0-20200702023911-3e80e3146ce5
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.34.0
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20250929084418-b950278ead30
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.5
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6
github.com/threefoldtech/zbus v1.0.1
github.com/threefoldtech/zosbase v1.0.9-0.20260301142245-21fab3972956
github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
github.com/threefoldtech/zosbase v1.0.10
github.com/urfave/cli/v2 v2.27.5
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -38,7 +38,7 @@ require (
github.com/containernetworking/plugins v1.2.0 // indirect
github.com/dave/jennifer v1.3.0 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/base58 v1.0.5 // indirect
github.com/decred/base58 v1.0.6 // indirect
github.com/diskfs/go-diskfs v1.2.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/g0rbe/go-chattr v0.0.0-20190906133247-aa435a6a0a37 // indirect
Expand Down Expand Up @@ -71,50 +71,51 @@ require (
github.com/whs/nacl-sealed-box v0.0.0-20180930164530-92b9ba845d8d // indirect
github.com/yggdrasil-network/yggdrasil-go v0.4.0 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b // indirect
)

require (
filippo.io/edwards25519 v1.2.0 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/containerd/api v1.8.0 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/typeurl/v2 v2.1.1 // indirect
github.com/coreos/go-iptables v0.6.0 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ethereum/go-ethereum v1.11.6 // indirect
github.com/ethereum/go-ethereum v1.17.1 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/golang/snappy v1.0.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/gtank/ristretto255 v0.2.0 // indirect
github.com/hanwen/go-fuse/v2 v2.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/holiman/uint256 v1.3.2 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
Expand All @@ -141,7 +142,7 @@ require (
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/safchain/ethtool v0.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
Expand All @@ -150,27 +151,28 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/vedhavyas/go-subkey v1.0.3 // indirect
github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/xxtea/xxtea-go v0.0.0-20170828040851-35c4b17eecf6 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/bbolt v1.3.10 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/mock v0.5.2 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.zx2c4.com/wireguard v0.0.20200320 // indirect
gonum.org/v1/gonum v0.16.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
google.golang.org/grpc v1.77.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/djherbis/times.v1 v1.2.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading