From 6f79c54dfa3f554210630ebbfb336451c9978888 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Fri, 25 Oct 2024 15:55:23 +0800 Subject: [PATCH] Fix the KIBISHII_DIRECTORY parameter not working issue. Signed-off-by: Xun Jiang --- test/Makefile | 2 +- test/e2e/migration/migration.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/Makefile b/test/Makefile index 1210df871a..276cc76afd 100644 --- a/test/Makefile +++ b/test/Makefile @@ -197,7 +197,7 @@ run-e2e: ginkgo --standby-cluster-name=$(STANDBY_CLUSTER_NAME) \ --eks-policy-arn=$(EKS_POLICY_ARN) \ --default-cls-service-account-name=$(DEFAULT_CLS_SERVICE_ACCOUNT_NAME) \ - --standby-cls-service-account-name=$(STANDBY_CLS_SERVICE_ACCOUNT_NAME) + --standby-cls-service-account-name=$(STANDBY_CLS_SERVICE_ACCOUNT_NAME) \ --kibishii-directory=$(KIBISHII_DIRECTORY) \ --disable-informer-cache=$(DISABLE_INFORMER_CACHE) diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go index 8316126e6e..a5a8cc1189 100644 --- a/test/e2e/migration/migration.go +++ b/test/e2e/migration/migration.go @@ -164,11 +164,10 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version) semver.Compare(versionWithoutPatch, "v1.14") < 0 { OriginVeleroCfg.Plugins = OriginVeleroCfg.Plugins + "," + migrationNeedPlugins[CSI][0] } - if OriginVeleroCfg.SnapshotMoveData { - if OriginVeleroCfg.CloudProvider == Azure { - OriginVeleroCfg.Plugins = OriginVeleroCfg.Plugins + "," + migrationNeedPlugins[AWS][0] - } + if OriginVeleroCfg.SnapshotMoveData && OriginVeleroCfg.CloudProvider == Azure { + OriginVeleroCfg.Plugins = OriginVeleroCfg.Plugins + "," + migrationNeedPlugins[AWS][0] } + veleroCLI2Version.VeleroCLI, err = InstallVeleroCLI(veleroCLI2Version.VeleroVersion) Expect(err).To(Succeed()) }