diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9dadd90d6..9cea93092 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -380,6 +380,17 @@ jobs: strategy: fail-fast: false matrix: + multiplier: + - 0 + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 include: - fabricmode: spine-leaf includeonie: true @@ -428,7 +439,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: show-tech-hlab-${{ matrix.fabricmode }}-${{ matrix.includeonie }}-${{ matrix.buildmode }} + name: show-tech-hlab-${{ matrix.fabricmode }}-${{ matrix.includeonie }}-${{ matrix.buildmode }}-${{ matrix.multiplier }} path: show-tech-output - name: Dump local registry logs diff --git a/go.mod b/go.mod index 923e10133..69139ec52 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/urfave/cli/v2 v2.27.5 github.com/vbauerster/mpb/v8 v8.9.1 github.com/vishvananda/netlink v1.3.0 - go.githedgehog.com/fabric v0.61.1 + go.githedgehog.com/fabric v0.62.0 golang.org/x/crypto v0.32.0 golang.org/x/sync v0.10.0 golang.org/x/term v0.28.0 diff --git a/go.sum b/go.sum index 14d34db40..da9499c1f 100644 --- a/go.sum +++ b/go.sum @@ -872,8 +872,8 @@ github.com/zealic/xignore v0.3.3 h1:EpLXUgZY/JEzFkTc+Y/VYypzXtNz+MSOMVCGW5Q4CKQ= github.com/zealic/xignore v0.3.3/go.mod h1:lhS8V7fuSOtJOKsvKI7WfsZE276/7AYEqokv3UiqEAU= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= -go.githedgehog.com/fabric v0.61.1 h1:NsI/ghTkHLuwXppzK6bhvEuEAlx/Huk24+0nViUgPMk= -go.githedgehog.com/fabric v0.61.1/go.mod h1:n7jiGJW2LnZnxPVqLBvZWzMZ52WNnYJuD37Y+NDlmG0= +go.githedgehog.com/fabric v0.62.0 h1:gIHe1KVxPeSVWCFZucm5m2WQIwoDkfA1h3+3KtNu5n0= +go.githedgehog.com/fabric v0.62.0/go.mod h1:hMRB0jfAFTgsO8TNk4V4F7M0xHG/+RfdRiI9c9yK0Go= go.githedgehog.com/fabric-bcm-ygot v0.2.0-4.4.0 h1:vxflsKB6+aIrXGeuWxagL82Eze8N2eGJzQ9bCazvcPU= go.githedgehog.com/fabric-bcm-ygot v0.2.0-4.4.0/go.mod h1:P/rTRtJedD3Pw72xgXYLPZAP8RpK2YmUR15qHGHxQWE= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= diff --git a/pkg/fab/versions.go b/pkg/fab/versions.go index 5585debc1..2e89775cd 100644 --- a/pkg/fab/versions.go +++ b/pkg/fab/versions.go @@ -13,7 +13,7 @@ import ( var ( FabricatorVersion = meta.Version(version.Version) - FabricVersion = meta.Version("v0.61.1") + FabricVersion = meta.Version("v0.62.0") ) var Versions = fabapi.Versions{ diff --git a/vendor/go.githedgehog.com/fabric/api/agent/v1beta1/agent_types.go b/vendor/go.githedgehog.com/fabric/api/agent/v1beta1/agent_types.go index b761d9d7b..aa21daffc 100644 --- a/vendor/go.githedgehog.com/fabric/api/agent/v1beta1/agent_types.go +++ b/vendor/go.githedgehog.com/fabric/api/agent/v1beta1/agent_types.go @@ -130,8 +130,10 @@ type AgentStatus struct { Version string `json:"version,omitempty"` // ID of the agent installation, used to track NOS re-installs InstallID string `json:"installID,omitempty"` - // ID of the agent run, used to track NOS reboots + // ID of the agent run, used to track agent restarts RunID string `json:"runID,omitempty"` + // ID for the NOS boot, used to track NOS reboots + BootID string `json:"bootID,omitempty"` // Time of the last heartbeat from the agent LastHeartbeat metav1.Time `json:"lastHeartbeat,omitempty"` // Time of the last attempt to apply configuration diff --git a/vendor/go.githedgehog.com/fabric/pkg/hhfctl/switch.go b/vendor/go.githedgehog.com/fabric/pkg/hhfctl/switch.go index de2b4e8e7..285076448 100644 --- a/vendor/go.githedgehog.com/fabric/pkg/hhfctl/switch.go +++ b/vendor/go.githedgehog.com/fabric/pkg/hhfctl/switch.go @@ -66,11 +66,11 @@ func SwitchReboot(ctx context.Context, name string) error { return err } - if agent.Status.RunID == "" { - return fmt.Errorf("agent is not running (missing .status.runID)") //nolint:goerr113 + if agent.Status.BootID == "" { + return fmt.Errorf("agent is not running (missing .status.bootID)") //nolint:goerr113 } - agent.Spec.Reboot = agent.Status.RunID + agent.Spec.Reboot = agent.Status.BootID err = kube.Update(ctx, agent) if err != nil { return fmt.Errorf("updating agent object: %w", err) @@ -90,11 +90,11 @@ func SwitchPowerReset(ctx context.Context, name string) error { return err } - if agent.Status.RunID == "" { - return fmt.Errorf("agent is not running (missing .status.runID)") //nolint:goerr113 + if agent.Status.BootID == "" { + return fmt.Errorf("agent is not running (missing .status.bootID)") //nolint:goerr113 } - agent.Spec.PowerReset = agent.Status.RunID + agent.Spec.PowerReset = agent.Status.BootID err = kube.Update(ctx, agent) if err != nil { return fmt.Errorf("updating agent object: %w", err) diff --git a/vendor/modules.txt b/vendor/modules.txt index f5166916d..41a6fa00f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1569,7 +1569,7 @@ github.com/zealic/xignore # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.githedgehog.com/fabric v0.61.1 +# go.githedgehog.com/fabric v0.62.0 ## explicit; go 1.23.0 go.githedgehog.com/fabric/api/agent/v1beta1 go.githedgehog.com/fabric/api/dhcp/v1beta1