Skip to content

Commit 5950728

Browse files
openshift-cherrypick-robotkaovilaihhpatel14
authored
[oadp-1.2] master: Add data mover to e2e cherrypick of #863 (#966)
* master: Add data mover to e2e cherrypick of #863 Co-authored-by: Tiger Kaovilai <[email protected]> * workaround to fix existing PVC of the same name found.. Signed-off-by: Tiger Kaovilai <[email protected]> * 1.2 update * add restorePhase async plugin waiting phases Signed-off-by: Tiger Kaovilai <[email protected]> * Remove duplicate application installs, add CSIDataMover failure deletion handling, volsync channel stable-0.7 Signed-off-by: Tiger Kaovilai <[email protected]> * Create app, and therefore namespace, before creating PVC into namespace Signed-off-by: Tiger Kaovilai <[email protected]> * FEntry typo Signed-off-by: Tiger Kaovilai <[email protected]> * enable volsync MoverSecurityContext Signed-off-by: Tiger Kaovilai <[email protected]> * Update mysql/mariadb pod securityContext to match Dockerfile USER for volsync to pick up. Signed-off-by: Tiger Kaovilai <[email protected]> * add vsmv1alpha1 to client scheme for failure cleanup Signed-off-by: Tiger Kaovilai <[email protected]> --------- Signed-off-by: Tiger Kaovilai <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> Co-authored-by: hhpatel14 <[email protected]>
1 parent ac1eb44 commit 5950728

16 files changed

+475
-110
lines changed

‎Makefile

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,14 +425,16 @@ sed -r "s/[&]* [!] $(CLUSTER_TYPE)|[!] $(CLUSTER_TYPE) [&]*//")) || $(CLUSTER_TY
425425
#TEST_FILTER := $(shell echo '! aws && ! gcp && ! azure' | sed -r "s/[&]* [!] $(CLUSTER_TYPE)|[!] $(CLUSTER_TYPE) [&]*//")
426426
SETTINGS_TMP=/tmp/test-settings
427427

428+
.PHONY: test-e2e-setup
428429
test-e2e-setup:
429430
mkdir -p $(SETTINGS_TMP)
430431
TARGET_CI_CRED_FILE="$(CI_CRED_FILE)" AZURE_RESOURCE_FILE="$(AZURE_RESOURCE_FILE)" CI_JSON_CRED_FILE="$(AZURE_CI_JSON_CRED_FILE)" \
431432
OADP_JSON_CRED_FILE="$(AZURE_OADP_JSON_CRED_FILE)" OADP_CRED_FILE="$(OADP_CRED_FILE)" OPENSHIFT_CI="$(OPENSHIFT_CI)" \
432433
PROVIDER="$(VELERO_PLUGIN)" BUCKET="$(OADP_BUCKET)" BSL_REGION="$(BSL_REGION)" SECRET="$(CREDS_SECRET_REF)" TMP_DIR=$(SETTINGS_TMP) \
433434
VSL_REGION="$(VSL_REGION)" BSL_AWS_PROFILE="$(BSL_AWS_PROFILE)" /bin/bash "tests/e2e/scripts/$(CLUSTER_TYPE)_settings.sh"
434435

435-
test-e2e: test-e2e-setup ## execute the oadp integration tests
436+
.PHONY: test-e2e-ginkgo
437+
test-e2e-ginkgo: test-e2e-setup
436438
ginkgo run -mod=mod tests/e2e/ -- -credentials=$(OADP_CRED_FILE) \
437439
-velero_namespace=$(OADP_TEST_NAMESPACE) \
438440
-settings=$(SETTINGS_TMP)/oadpcreds \
@@ -443,7 +445,34 @@ test-e2e: test-e2e-setup ## execute the oadp integration tests
443445
-provider=$(CLUSTER_TYPE) \
444446
-creds_secret_ref=$(CREDS_SECRET_REF) \
445447
-artifact_dir=$(ARTIFACT_DIR) \
446-
-oc_cli=$(OC_CLI)
448+
-oc_cli=$(OC_CLI) \
449+
--ginkgo.timeout=2h
447450

448-
test-e2e-cleanup:
451+
.PHONY: test-e2e
452+
test-e2e: volsync-install test-e2e-ginkgo
453+
454+
.PHONY: test-e2e-cleanup
455+
test-e2e-cleanup: volsync-uninstall
449456
rm -rf $(SETTINGS_TMP)
457+
458+
.PHONY: volsync-install
459+
volsync-install:
460+
$(eval VS_CURRENT_CSV:=$(shell oc get subscription volsync-product -n openshift-operators -ojsonpath='{.status.currentCSV}'))
461+
# OperatorGroup not required, volsync is global operator which has operatorgroup already.
462+
# Create subscription for operator if not installed.
463+
@if [ "$(VS_CURRENT_CSV)" == "" ]; then \
464+
$(OC_CLI) replace --force -f tests/e2e/volsync/volsync-sub.yaml; \
465+
else \
466+
echo $(VS_CURRENT_CSV) already installed; \
467+
fi
468+
469+
.PHONY: volsync-uninstall
470+
volsync-uninstall:
471+
$(eval VS_CURRENT_CSV:=$(shell oc get subscription volsync-product -n openshift-operators -ojsonpath='{.status.currentCSV}'))
472+
@if [ "$(VS_CURRENT_CSV)" != "" ]; then \
473+
echo "Uninstalling $(VS_CURRENT_CSV)"; \
474+
$(OC_CLI) delete subscription volsync-product -n openshift-operators && \
475+
$(OC_CLI) delete csv $(VS_CURRENT_CSV) -n openshift-operators; \
476+
else \
477+
echo No subscription found, skipping uninstall; \
478+
fi

‎build/ci-Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ COPY ./ .
88
RUN go get -d -u github.com/onsi/ginkgo/ginkgo && \
99
go get -d -u github.com/onsi/ginkgo/v2/ginkgo && \
1010
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@latest
11-
# pin v1.22 as latest requires go 1.18
12-
RUN go get -d -u github.com/onsi/[email protected]
11+
RUN go get github.com/onsi/[email protected]
1312
RUN chmod -R 777 ./
1413
RUN chmod -R 777 /go/
1514
RUN go mod download

‎go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ require (
2424
sigs.k8s.io/controller-runtime v0.12.2
2525
)
2626

27-
require github.com/google/go-cmp v0.5.9
27+
require (
28+
github.com/backube/volsync v0.4.0
29+
github.com/google/go-cmp v0.5.9
30+
github.com/konveyor/volume-snapshot-mover v0.0.0-20220725191622-4b360b792c3e
31+
)
2832

2933
require (
3034
cloud.google.com/go v0.100.2 // indirect

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l
142142
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
143143
github.com/aws/aws-sdk-go v1.43.31 h1:yJZIr8nMV1hXjAvvOLUFqZRJcHV7udPQBfhJqawDzI0=
144144
github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
145+
github.com/backube/volsync v0.4.0 h1:hyZgzCrDm0O40CeyU7cCZ3nzTvPZvN1lAyuHyUHRNNw=
146+
github.com/backube/volsync v0.4.0/go.mod h1:F5RD2AxYwORN2TdgylgDL2gOE4ra6vESWA30LTPHO+Q=
145147
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
146148
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
147149
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@@ -557,6 +559,8 @@ github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE
557559
github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
558560
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
559561
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
562+
github.com/konveyor/volume-snapshot-mover v0.0.0-20220725191622-4b360b792c3e h1:DGsRtnWzUM30smT5qBoglDGZAw4/A1GUm8cpvjrBwc4=
563+
github.com/konveyor/volume-snapshot-mover v0.0.0-20220725191622-4b360b792c3e/go.mod h1:ykj3RTgJyA5tsL2n4fRlk1LS2ln7wluHsryE+lMussY=
560564
github.com/kopia/kopia v0.10.7 h1:6s0ZIZW3Ge2ozzefddASy7CIUadp/5tF9yCDKQfAKKI=
561565
github.com/kopia/kopia v0.10.7/go.mod h1:0d9THPD+jwomPcXvPbCdmLyX6phQVP7AqcCcDEajfNA=
562566
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=

0 commit comments

Comments
 (0)