Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ OADP_BUCKET ?= $(shell cat $(OADP_BUCKET_FILE))
SETTINGS_TMP=/tmp/test-settings

.PHONY: test-e2e-setup
test-e2e-setup: login-required build-must-gather
test-e2e-setup: login-required
mkdir -p $(SETTINGS_TMP)
TMP_DIR=$(SETTINGS_TMP) \
OPENSHIFT_CI="$(OPENSHIFT_CI)" \
Expand Down Expand Up @@ -902,10 +902,3 @@ endif
$(SED) -i "s%resources:%resources:\n- $$file_name%" $(shell pwd)/config/samples/kustomization.yaml;done
@make bundle

.PHONY: build-must-gather
build-must-gather: check-go ## Build OADP Must-gather binary must-gather/oadp-must-gather
ifeq ($(SKIP_MUST_GATHER),true)
echo "Skipping must-gather build"
else
cd must-gather && go build -mod=mod -a -o oadp-must-gather cmd/main.go
endif
3 changes: 2 additions & 1 deletion docs/developer/testing/TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ To get started, you need to provide the following **required** environment varia
| `TEST_HCP` | Exclusively run Hypershift backup/restore testing | `false` | false |
| `TEST_UPGRADE` | Exclusively run upgrade tests. Need to first run `make catalog-test-upgrade`, if testing non production operator | `false` | false |
| `TEST_CLI` | Exclusively run CLI-based backup/restore testing | `false` | false |
| `SKIP_MUST_GATHER` | must-gather is compiled locally in the Makefile, may cause issue if local and cluster arch do not match| `false` | false |
| `SKIP_MUST_GATHER` | Skip running must-gather collection during E2E tests | `false` | false |
| `MUST_GATHER_IMAGE` | Container image to use for must-gather collection via `oc adm must-gather` | `quay.io/konveyor/oadp-must-gather:latest` | false |

> **Note:**

Expand Down
41 changes: 0 additions & 41 deletions must-gather/Dockerfile

This file was deleted.

119 changes: 0 additions & 119 deletions must-gather/README.md

This file was deleted.

26 changes: 0 additions & 26 deletions must-gather/cmd/main.go

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_1h

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_1h_essential

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_24h

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_24h_essential

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_6h

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_6h_essential

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_72h

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_72h_essential

This file was deleted.

26 changes: 0 additions & 26 deletions must-gather/deprecated/gather_all

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_all_essential

This file was deleted.

5 changes: 0 additions & 5 deletions must-gather/deprecated/gather_metrics_dump

This file was deleted.

15 changes: 0 additions & 15 deletions must-gather/deprecated/gather_with_timeout

This file was deleted.

15 changes: 0 additions & 15 deletions must-gather/deprecated/gather_without_tls

This file was deleted.

Loading