From 9d0493c2b58de0ba4eea6639db57cdee45cf1283 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Fri, 28 Mar 2025 11:41:39 +0800 Subject: [PATCH] Bump the migration and upgrade E2E test source version. Add v1.16 related plugin and other image default version. Signed-off-by: Xun Jiang --- test/Makefile | 4 ++-- test/util/velero/velero_utils.go | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index b3cf6eadd..2f48929cb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -74,7 +74,7 @@ HAS_VSPHERE_PLUGIN ?= false RESTORE_HELPER_IMAGE ?= #Released version only -UPGRADE_FROM_VELERO_VERSION ?= v1.13.2,v1.14.1 +UPGRADE_FROM_VELERO_VERSION ?= v1.14.1,v1.15.2 # 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 @@ -83,7 +83,7 @@ UPGRADE_FROM_VELERO_VERSION ?= v1.13.2,v1.14.1 # 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.14.1,self +MIGRATE_FROM_VELERO_VERSION ?= v1.15.2,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 d799df9f7..716ac2e36 100644 --- a/test/util/velero/velero_utils.go +++ b/test/util/velero/velero_utils.go @@ -112,6 +112,15 @@ var ImagesMatrix = map[string]map[string][]string{ "velero": {"gcr.io/velero-gcp/velero:v1.15.0"}, "velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.15.0"}, }, + "v1.16": { + "aws": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.12.0"}, + "azure": {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.12.0"}, + "vsphere": {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"}, + "gcp": {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.12.0"}, + "datamover": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.12.0"}, + "velero": {"gcr.io/velero-gcp/velero:v1.15.0"}, + "velero-restore-helper": {"gcr.io/velero-gcp/velero:v1.16.0"}, + }, "main": { "aws": {"gcr.io/velero-gcp/velero-plugin-for-aws:main"}, "azure": {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:main"},