Skip to content

Commit 546f3c2

Browse files
Merge pull request #1202 from petr-muller/ota-1531-drop-test-prerequisites
NO-JIRA: test: remove unnecessary integration tests layers
2 parents 3a6c08b + 25d6659 commit 546f3c2

35 files changed

+5
-3200
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ test:
1212
.PHONY: test
1313

1414
integration-test:
15-
hack/test-integration.sh
15+
# This runs against a real OpenShift cluster through the current KUBECONFIG context
16+
TEST_INTEGRATION=1 go test ./... -test.run=^TestIntegration
1617
.PHONY: integration-test
1718

1819
update: build

docs/dev/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,12 @@ Run `make test` to execute all unit tests.
5959

6060
### Integration tests
6161

62-
The [`hack/test-integration.sh`](../../hack/test-integration.sh) script executes integration tests against an OpenShift
63-
cluster. It requires `$KUBECONFIG` with administrator credentials. Only execute integration tests against disposable
64-
testing clusters.
62+
Run `make integration-test` to execute integration tests against an OpenShift cluster. It requires `$KUBECONFIG` with
63+
administrator credentials. Only execute integration tests against disposable testing clusters.
6564

6665
```console
6766
$ export KUBECONFIG=<admin kubeconfig path>
68-
$ ./hack/test-integration.sh
67+
$ make integration-test
6968
```
7069

7170
### Replace cluster's CVO with development CVO release payload image

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ toolchain go1.23.6
77
require (
88
github.com/blang/semver/v4 v4.0.0
99
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
10-
github.com/ghodss/yaml v1.0.0
1110
github.com/google/go-cmp v0.6.0
1211
github.com/google/uuid v1.6.0
1312
github.com/onsi/ginkgo/v2 v2.21.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
2020
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
2121
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
2222
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
23-
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
24-
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
2523
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
2624
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2725
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=

hack/test-integration.sh

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

hack/test-prerequisites.go

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

vendor/github.com/ghodss/yaml/.gitignore

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

vendor/github.com/ghodss/yaml/.travis.yml

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

vendor/github.com/ghodss/yaml/LICENSE

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

vendor/github.com/ghodss/yaml/README.md

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

0 commit comments

Comments
 (0)