Skip to content

Commit 9b3583e

Browse files
authored
Merge pull request #725 from bertinatto/integration-mom
API-1835: Use test-operator-integration target from build-machinery-go
2 parents fa0aa49 + 64db9a0 commit 9b3583e

File tree

8 files changed

+61
-8
lines changed

8 files changed

+61
-8
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
88
targets/openshift/images.mk \
99
targets/openshift/bindata.mk \
1010
targets/openshift/operator/telepresence.mk \
11+
targets/openshift/operator/mom.mk \
1112
)
1213

1314
# Run core verification and all self contained tests.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/ghodss/yaml v1.0.0
88
github.com/google/go-cmp v0.6.0
99
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f
10-
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
10+
github.com/openshift/build-machinery-go v0.0.0-20241025131534-5f3bc3c56265
1111
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
1212
github.com/openshift/library-go v0.0.0-20241025192116-97dc382cad13
1313
github.com/openshift/multi-operator-manager v0.0.0-20241022160113-b880eaae93fc

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
144144
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
145145
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f h1:ya1OmyZm3LIIxI3U9VE9Nyx3ehCHgBwxyFUPflYPWls=
146146
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
147-
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0zE2bmdVvaEd18VXuGYQdJJ1FYJu4MIDW9PYZWc9No=
148-
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
147+
github.com/openshift/build-machinery-go v0.0.0-20241025131534-5f3bc3c56265 h1:FTAb86n2lB4LJUXsNR7tzWIQHTDdW3H9SewKGai3iow=
148+
github.com/openshift/build-machinery-go v0.0.0-20241025131534-5f3bc3c56265/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
149149
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
150150
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
151151
github.com/openshift/library-go v0.0.0-20241025192116-97dc382cad13 h1:59NslqHDdxffgFww2qnzc6HZ1OHvfVzkUpEICiZAvok=

vendor/github.com/openshift/build-machinery-go/OWNERS

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

vendor/github.com/openshift/build-machinery-go/make/operator.example.mk.help.log

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

vendor/github.com/openshift/build-machinery-go/make/targets/openshift/operator/mom.mk

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

vendor/github.com/openshift/build-machinery-go/scripts/test-operator-integration.sh

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

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ github.com/openshift/api/template
242242
github.com/openshift/api/template/v1
243243
github.com/openshift/api/user
244244
github.com/openshift/api/user/v1
245-
# github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
245+
# github.com/openshift/build-machinery-go v0.0.0-20241025131534-5f3bc3c56265
246246
## explicit; go 1.22.0
247247
github.com/openshift/build-machinery-go
248248
github.com/openshift/build-machinery-go/make

0 commit comments

Comments
 (0)