Skip to content

Commit

Permalink
Merge pull request #7802 from blackpiglet/bump_e2e_migration_and_upda…
Browse files Browse the repository at this point in the history
…te_test_version

Bump the E2E upgrade and migration test version.
  • Loading branch information
blackpiglet authored May 17, 2024
2 parents 65a831e + 291d55f commit f654188
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ VELERO_IMAGE ?= velero/velero:main
PLUGINS ?=
RESTORE_HELPER_IMAGE ?=
#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 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
# Script will still read UPGRADE_FROM_VELERO_CLI list to match UPGRADE_FROM_VELERO_VERSION list from beginning
# 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.0,self
MIGRATE_FROM_VELERO_VERSION ?= v1.13.2,self
MIGRATE_FROM_VELERO_CLI ?=

VELERO_NAMESPACE ?= velero
Expand Down
7 changes: 7 additions & 0 deletions test/util/velero/velero_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ var pluginsMatrix = map[string]map[string][]string{
"csi": {"velero/velero-plugin-for-csi:v0.7.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": {
"aws": {"velero/velero-plugin-for-aws:main"},
"azure": {"velero/velero-plugin-for-microsoft-azure:main"},
Expand Down

0 comments on commit f654188

Please sign in to comment.