vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7802 from blackpiglet/bump_e2e_migration_and_update_test_version 

Bump the E2E upgrade and migration test version.
pull/7592/head
Xun Jiang/Bruce Jiang 2024-05-17 15:09:50 +08:00 committed by GitHub
parent 65a831ed67 291d55f154
commit f654188243
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/Makefile
View File

@ -56,7 +56,7 @@ VELERO_IMAGE ?= velero/velero:main
PLUGINS ?= PLUGINS ?=
RESTORE_HELPER_IMAGE ?= RESTORE_HELPER_IMAGE ?=
#Released version only #Released version only
UPGRADE_FROM_VELERO_VERSION ?= v1.12.3,v1.13.0 UPGRADE_FROM_VELERO_VERSION ?= v1.12.3,v1.13.2
# UPGRADE_FROM_VELERO_CLI can has the same format(a list divided by comma) with UPGRADE_FROM_VELERO_VERSION # 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 # 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 # So although length of UPGRADE_FROM_VELERO_CLI list is not equal with UPGRADE_FROM_VELERO_VERSION
@ -64,7 +64,7 @@ UPGRADE_FROM_VELERO_VERSION ?= v1.12.3,v1.13.0
# to the end, nil string will be set if UPGRADE_FROM_VELERO_CLI is shorter than UPGRADE_FROM_VELERO_VERSION # to the end, nil string will be set if UPGRADE_FROM_VELERO_CLI is shorter than UPGRADE_FROM_VELERO_VERSION
UPGRADE_FROM_VELERO_CLI ?= UPGRADE_FROM_VELERO_CLI ?=
MIGRATE_FROM_VELERO_VERSION ?= v1.13.0,self MIGRATE_FROM_VELERO_VERSION ?= v1.13.2,self
MIGRATE_FROM_VELERO_CLI ?= MIGRATE_FROM_VELERO_CLI ?=
VELERO_NAMESPACE ?= velero VELERO_NAMESPACE ?= velero

7
test/util/velero/velero_utils.go
View File

@ -105,6 +105,13 @@ var pluginsMatrix = map[string]map[string][]string{
"csi": {"velero/velero-plugin-for-csi:v0.7.0"}, "csi": {"velero/velero-plugin-for-csi:v0.7.0"},
"datamover": {"velero/velero-plugin-for-aws:v1.9.0"}, "datamover": {"velero/velero-plugin-for-aws:v1.9.0"},
}, },
"v1.14": {
"aws": {"velero/velero-plugin-for-aws:v1.10.0"},
"azure": {"velero/velero-plugin-for-microsoft-azure:v1.10.0"},
"vsphere": {"vsphereveleroplugin/velero-plugin-for-vsphere:v1.5.2"},
"gcp": {"velero/velero-plugin-for-gcp:v1.10.0"},
"datamover": {"velero/velero-plugin-for-aws:v1.10.0"},
},
"main": { "main": {
"aws": {"velero/velero-plugin-for-aws:main"}, "aws": {"velero/velero-plugin-for-aws:main"},
"azure": {"velero/velero-plugin-for-microsoft-azure:main"}, "azure": {"velero/velero-plugin-for-microsoft-azure:main"},