Skip to content

Commit

Permalink
Rework to use images.yaml file from deployments
Browse files Browse the repository at this point in the history
Signed-off-by: Vladimir Popov <vladimir.popov@xored.com>
  • Loading branch information
Vladimir Popov committed Oct 12, 2021
1 parent 6f78e39 commit ce5b406
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 626 deletions.
10 changes: 8 additions & 2 deletions extensions/base/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package base

import (
"fmt"

"github.com/networkservicemesh/gotestmd/pkg/suites/shell"
"github.com/networkservicemesh/integration-tests/extensions/checkout"
"github.com/networkservicemesh/integration-tests/extensions/logs"
Expand Down Expand Up @@ -48,17 +50,21 @@ func (s *Suite) TearDownSuite() {
s.storeSuiteLogs()
}

const (
sha = "61e3eb260f1fc0f66e4d7bdab513fd7cecd8c0d7"
)

// SetupSuite runs all extensions
func (s *Suite) SetupSuite() {
s.checkout.Repository = "networkservicemesh/deployments-k8s"
s.checkout.Version = "bf12efe5"
s.checkout.Version = sha[:8]
s.checkout.Dir = "../" // Note: this should be synced with input parameters in gen.go file

s.checkout.SetT(s.T())
s.checkout.SetupSuite()

// prefetch
s.prefetch.Dir = "../deployments-k8s" // Note: this should be synced with input parameters in gen.go file
s.prefetch.ImagesURL = fmt.Sprintf("https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/%s/images.yaml", sha)

s.prefetch.SetT(s.T())
s.prefetch.SetupSuite()
Expand Down
264 changes: 0 additions & 264 deletions extensions/prefetch/find.go

This file was deleted.

6 changes: 2 additions & 4 deletions extensions/prefetch/ignore.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

package prefetch

import "regexp"

var (
// IsExcluded is using for filtering applications that should not be used in the prefetching.
IsExcluded = regexp.MustCompile("(.*-sriov)|(.*-vfio)").MatchString
// Tags is used for filtering images that should not be used in the prefetching.
Tags = make(map[string]struct{})
)
4 changes: 1 addition & 3 deletions extensions/prefetch/sriov/sriov.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ import (
)

func init() {
prefetch.IsExcluded = func(_ string) bool {
return false
}
prefetch.Tags["sriov"] = struct{}{}
}
Loading

0 comments on commit ce5b406

Please sign in to comment.