Skip to content

Commit 089e726

Browse files
committed
UPSTREAM: <carry>: Consolidate build API
This consolidates the in-cluster building of a bundle and catalog. The catalog and bundle bindata are inputs, along with a set of replacements so that catalog and bundle templates can be used to create the images. This can be done in the BeforeEach() for a set of tests that use the same data. Signed-off-by: Todd Short <[email protected]>
1 parent c911522 commit 089e726

File tree

8 files changed

+447
-560
lines changed

8 files changed

+447
-560
lines changed

openshift/tests-extension/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ pkg/bindata/catalog/catalog.go: $(shell find testdata/catalog -type f)
7878
mkdir -p $(@D)
7979
$(GO_BINDATA) -pkg catalog -o $@ -prefix "testdata/catalog" testdata/catalog/...
8080
go fmt ./$(@D)/...
81+
8182
bindata: pkg/bindata/webhook/bundle/bundle.go
8283
pkg/bindata/webhook/bundle/bundle.go: $(shell find testdata/webhook/bundle -type f)
8384
mkdir -p $(@D)

openshift/tests-extension/pkg/bindata/catalog/catalog.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openshift/tests-extension/pkg/bindata/webhook/bundle/bundle.go

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openshift/tests-extension/pkg/bindata/webhook/index/index.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)