Skip to content

Commit b18f943

Browse files
author
Per Goncalves da Silva
committed
Updates
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent 62eb2d3 commit b18f943

53 files changed

Lines changed: 406 additions & 1218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ TEST_OPERATOR_CONTROLLERS=v1.0.0 v2.0.0
251251

252252
.PHONY: $(TEST_OPERATOR_CONTROLLERS)
253253
$(TEST_OPERATOR_CONTROLLERS):
254-
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/images/controllers/test-operator/$@/manager ./test/test-operator/$@/cmd/main.go
254+
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/images/controllers/test-operator/$@/manager ./testdata/images/bundles/test-operator/$@/cmd/main.go
255255

256256
.PHONY: test-operator-controllers
257257
test-operator-controllers: $(TEST_OPERATOR_CONTROLLERS)
@@ -261,7 +261,6 @@ E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
261261
image-registry: export GOOS=linux
262262
image-registry: export GOARCH=amd64
263263
image-registry: $(TEST_OPERATOR_CONTROLLERS) ## Build the testdata catalog used for e2e tests and push it to the image registry
264-
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/registry/bin/registry ./testdata/registry/registry.go
265264
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push ./testdata/push/push.go
266265
$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
267266
$(CONTAINER_RUNTIME) save $(E2E_REGISTRY_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)

test/e2e/cluster_extension_install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
732732
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
733733
assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
734734
assert.Contains(ct, cond.Message, "Installed bundle")
735-
assert.Contains(ct, clusterExtension.Status.Install.Bundle.Version, "2.0.0")
735+
assert.Contains(ct, clusterExtension.Status.Install.Bundle.Version, "1.3.0")
736736
}
737737
}, pollDuration, pollInterval)
738738

test/test-operator/bundle.Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

test/test-operator/controller.Dockerfile

Lines changed: 0 additions & 33 deletions
This file was deleted.
-50.9 MB
Binary file not shown.

test/test-operator/v1.0.0/internal/controller/suite_test.go

Lines changed: 0 additions & 115 deletions
This file was deleted.

test/test-operator/v1.0.0/internal/controller/testoperator_controller_test.go

Lines changed: 0 additions & 90 deletions
This file was deleted.
-51.2 MB
Binary file not shown.

0 commit comments

Comments
 (0)