From 1831c7b2dc92fc472b6b7b4a0d0a312afc5b6b68 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Tue, 22 Oct 2024 14:38:19 +0800 Subject: [PATCH] Bump the E2E migration and upgrade Velero and plugin versions for 1.15 Signed-off-by: Xun Jiang --- test/Makefile | 4 ++-- test/util/velero/velero_utils.go | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index ab759b142..1210df871 100644 --- a/test/Makefile +++ b/test/Makefile @@ -59,7 +59,7 @@ VELERO_IMAGE ?= velero/velero:main PLUGINS ?= RESTORE_HELPER_IMAGE ?= #Released version only -UPGRADE_FROM_VELERO_VERSION ?= v1.12.3,v1.13.2 +UPGRADE_FROM_VELERO_VERSION ?= v1.13.2,v1.14.1 # UPGRADE_FROM_VELERO_CLI can has the same format(a list divided by comma) with UPGRADE_FROM_VELERO_VERSION # Upgrade tests will be executed sequently according to the list by UPGRADE_FROM_VELERO_VERSION # So although length of UPGRADE_FROM_VELERO_CLI list is not equal with UPGRADE_FROM_VELERO_VERSION @@ -67,7 +67,7 @@ UPGRADE_FROM_VELERO_VERSION ?= v1.12.3,v1.13.2 # to the end, nil string will be set if UPGRADE_FROM_VELERO_CLI is shorter than UPGRADE_FROM_VELERO_VERSION UPGRADE_FROM_VELERO_CLI ?= -MIGRATE_FROM_VELERO_VERSION ?= v1.13.2,self +MIGRATE_FROM_VELERO_VERSION ?= v1.14.1,self MIGRATE_FROM_VELERO_CLI ?= VELERO_NAMESPACE ?= velero diff --git a/test/util/velero/velero_utils.go b/test/util/velero/velero_utils.go index cbb95a849..bedfa25d1 100644 --- a/test/util/velero/velero_utils.go +++ b/test/util/velero/velero_utils.go @@ -112,6 +112,13 @@ var pluginsMatrix = map[string]map[string][]string{ "gcp": {"velero/velero-plugin-for-gcp:v1.10.1"}, "datamover": {"velero/velero-plugin-for-aws:v1.10.1"}, }, + "v1.15": { + "aws": {"velero/velero-plugin-for-aws:v1.11.0"}, + "azure": {"velero/velero-plugin-for-microsoft-azure:v1.11.0"}, + "vsphere": {"vsphereveleroplugin/velero-plugin-for-vsphere:v1.5.2"}, + "gcp": {"velero/velero-plugin-for-gcp:v1.11.0"}, + "datamover": {"velero/velero-plugin-for-aws:v1.11.0"}, + }, "main": { "aws": {"velero/velero-plugin-for-aws:main"}, "azure": {"velero/velero-plugin-for-microsoft-azure:main"},