mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-10-05 12:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: unlock CABPT/CACPPT provider versions

Browse Source 
We should always test latest versions of our providers.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov 2022-02-09 21:56:53 +03:00
parent df0e388a4f
commit 0da370dfef
No known key found for this signature in database
GPG Key ID: 7B26396447AB6DFD
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/test/e2e-capi.sh
View File

@ -5,8 +5,6 @@ set -eou pipefail
source ./hack/test/e2e.sh source ./hack/test/e2e.sh
export CAPI_VERSION="${CAPI_VERSION:-1.0.4}" export CAPI_VERSION="${CAPI_VERSION:-1.0.4}"
export CABPT_VERSION="${CABPT_VERSION:-0.5.0}"
export CACPPT_VERSION="${CACPPT_VERSION:-0.4.2}"
export CAPA_VERSION="${CAPA_VERSION:-1.2.0}" export CAPA_VERSION="${CAPA_VERSION:-1.2.0}"
export CAPG_VERSION="${CAPG_VERSION:-1.0.0}" export CAPG_VERSION="${CAPG_VERSION:-1.0.0}"
@ -27,9 +25,9 @@ set -x
${CLUSTERCTL} init \ ${CLUSTERCTL} init \
--core "cluster-api:v${CAPI_VERSION}" \ --core "cluster-api:v${CAPI_VERSION}" \
--control-plane "talos:v${CACPPT_VERSION}" \ --control-plane "talos" \
--infrastructure "aws:v${CAPA_VERSION},gcp:v${CAPG_VERSION}" \ --infrastructure "aws:v${CAPA_VERSION},gcp:v${CAPG_VERSION}" \
--bootstrap "talos:v${CABPT_VERSION}" --bootstrap "talos"
# Wait for the talosconfig # Wait for the talosconfig
timeout=$(($(date +%s) + ${TIMEOUT})) timeout=$(($(date +%s) + ${TIMEOUT}))

7
internal/integration/api/discovery.go
View File

@ -11,6 +11,7 @@ import (
"context" "context"
"fmt" "fmt"
"io" "io"
"strings"
"time" "time"
"github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/resource"
@ -187,7 +188,11 @@ func (suite *DiscoverySuite) TestRegistries() {
rawAffiliate := rawAffiliatesByID[registry+member.TypedSpec().NodeID] rawAffiliate := rawAffiliatesByID[registry+member.TypedSpec().NodeID]
suite.Require().NotNil(rawAffiliate) suite.Require().NotNil(rawAffiliate)
suite.Assert().Equal(member.TypedSpec().Hostname, rawAffiliate.TypedSpec().Hostname) stripDomain := func(s string) string { return strings.Split(s, ".")[0] }
// registries can be a bit inconsistent, e.g. whether they report fqdn or just hostname
suite.Assert().Contains([]string{member.TypedSpec().Hostname, stripDomain(member.TypedSpec().Hostname)}, rawAffiliate.TypedSpec().Hostname)
suite.Assert().Equal(member.TypedSpec().Addresses, rawAffiliate.TypedSpec().Addresses) suite.Assert().Equal(member.TypedSpec().Addresses, rawAffiliate.TypedSpec().Addresses)
suite.Assert().Equal(member.TypedSpec().OperatingSystem, rawAffiliate.TypedSpec().OperatingSystem) suite.Assert().Equal(member.TypedSpec().OperatingSystem, rawAffiliate.TypedSpec().OperatingSystem)
suite.Assert().Equal(member.TypedSpec().MachineType, rawAffiliate.TypedSpec().MachineType) suite.Assert().Equal(member.TypedSpec().MachineType, rawAffiliate.TypedSpec().MachineType)