Skip to content

Commit f352b31

Browse files
kaovilaiclaude
andcommitted
refactor(e2e): migrate to external oadp-must-gather container image
Remove local must-gather directory and build process in favor of using the external quay.io/konveyor/oadp-must-gather:latest image via oc adm must-gather. This eliminates architecture mismatch issues and keeps must-gather code in its dedicated repository. Changes: - Updated RunMustGather() in tests/e2e/lib/apps.go to use oc adm must-gather - Added MUST_GATHER_IMAGE env var (defaults to quay.io/konveyor/oadp-must-gather:latest) - Removed build-must-gather target from Makefile - Removed entire must-gather/ directory (3,174 lines deleted) - Updated documentation in TESTING.md The SKIP_MUST_GATHER flag is preserved for skipping must-gather collection. Version-specific images can be used by setting MUST_GATHER_IMAGE env var. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 513180a commit f352b31

25 files changed

+33
-3174
lines changed

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ OADP_BUCKET ?= $(shell cat $(OADP_BUCKET_FILE))
789789
SETTINGS_TMP=/tmp/test-settings
790790

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

905-
.PHONY: build-must-gather
906-
build-must-gather: check-go ## Build OADP Must-gather binary must-gather/oadp-must-gather
907-
ifeq ($(SKIP_MUST_GATHER),true)
908-
echo "Skipping must-gather build"
909-
else
910-
cd must-gather && go build -mod=mod -a -o oadp-must-gather cmd/main.go
911-
endif

docs/developer/testing/TESTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ To get started, you need to provide the following **required** environment varia
2525
| `TEST_HCP` | Exclusively run Hypershift backup/restore testing | `false` | false |
2626
| `TEST_UPGRADE` | Exclusively run upgrade tests. Need to first run `make catalog-test-upgrade`, if testing non production operator | `false` | false |
2727
| `TEST_CLI` | Exclusively run CLI-based backup/restore testing | `false` | false |
28-
| `SKIP_MUST_GATHER` | must-gather is compiled locally in the Makefile, may cause issue if local and cluster arch do not match| `false` | false |
28+
| `SKIP_MUST_GATHER` | Skip running must-gather collection during E2E tests | `false` | false |
29+
| `MUST_GATHER_IMAGE` | Container image to use for must-gather collection via `oc adm must-gather` | `quay.io/konveyor/oadp-must-gather:latest` | false |
2930

3031
> **Note:**
3132

must-gather/Dockerfile

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

must-gather/README.md

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

must-gather/cmd/main.go

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

must-gather/deprecated/gather_1h

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

must-gather/deprecated/gather_1h_essential

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

must-gather/deprecated/gather_24h

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

must-gather/deprecated/gather_24h_essential

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

must-gather/deprecated/gather_6h

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

0 commit comments

Comments
 (0)