Skip to content

e2e tests: migrate the memcached molecule tests to use the new layout (1.0+) with mock samples stack #4011

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
camilamacedo86 merged 1 commit into from
Oct 23, 2020
Merged

e2e tests: migrate the memcached molecule tests to use the new layout (1.0+) with mock samples stack #4011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ website/resources/
website/node_modules/
website/tech-doc-hugo

# samples bin
# Ensure that will not commit the bin gen in the go sample
testdata/go/memcached-operator/bin/*

# Ignore molecule samples testdata if it be generated in the testdata/ diretory
testdata/ansible/memcached-molecule-operator

# Trash files
*\.DS_Store

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export PATH := $(PWD)/$(BUILD_DIR):$(PWD)/$(TOOLS_DIR):$(PATH)
.PHONY: generate
generate: build # Generate CLI docs and samples
go run ./hack/generate/cli-doc/gen-cli-doc.go
go run ./hack/generate/samples/generate_all.go
go run ./hack/generate/samples/generate_testdata.go
Copy link
Copy Markdown
Contributor Author

@camilamacedo86 camilamacedo86 Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make more sense be generate_testdata
it also makes more simplicity its goal.


.PHONY: bindata
OLM_VERSION=0.15.1
Expand Down
13 changes: 8 additions & 5 deletions hack/generate/samples/generate_all.go → hack/generate/samples/generate_testdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ import (
"github.com/operator-framework/operator-sdk/internal/testutils"
)

Copy link
Copy Markdown
Contributor Author

@camilamacedo86 camilamacedo86 Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just moving the vars to the main for not let them global in the pkg.

var (
binaryName string
)

func main() {
// testdata is the path where all samples should be generate
const testdata = "/testdata/"

// binaryName allow inform the binary that should be used.
// By default it is operator-sdk
var binaryName string

flag.StringVar(&binaryName, "bin", testutils.BinaryName, "Binary path that should be used")
flag.Parse()

Expand All @@ -41,7 +44,7 @@ func main() {
os.Exit(1)
}

samplesPath := filepath.Join(currentPath, "testdata")
samplesPath := filepath.Join(currentPath, testdata)
log.Infof("using the path: (%v)", samplesPath)

log.Infof("creating Helm Memcached Sample")
Expand Down
Loading