Skip to content

Commit 6df1424

Browse files
authored
Merge pull request #8828 from blackpiglet/bump_e2e_upgrade_migration_source_version
Bump the migration and upgrade E2E test source version.
2 parents 07fd98e + 9d0493c commit 6df1424

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ HAS_VSPHERE_PLUGIN ?= false
7474
RESTORE_HELPER_IMAGE ?=
7575

7676
#Released version only
77-
UPGRADE_FROM_VELERO_VERSION ?= v1.13.2,v1.14.1
77+
UPGRADE_FROM_VELERO_VERSION ?= v1.14.1,v1.15.2
7878

7979
# UPGRADE_FROM_VELERO_CLI can has the same format(a list divided by comma) with UPGRADE_FROM_VELERO_VERSION
8080
# 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
8383
# to the end, nil string will be set if UPGRADE_FROM_VELERO_CLI is shorter than UPGRADE_FROM_VELERO_VERSION
8484
UPGRADE_FROM_VELERO_CLI ?=
8585

86-
MIGRATE_FROM_VELERO_VERSION ?= v1.14.1,self
86+
MIGRATE_FROM_VELERO_VERSION ?= v1.15.2,self
8787
MIGRATE_FROM_VELERO_CLI ?=
8888

8989
VELERO_NAMESPACE ?= velero

test/util/velero/velero_utils.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,15 @@ var ImagesMatrix = map[string]map[string][]string{
112112
"velero": {"gcr.io/velero-gcp/velero:v1.15.0"},
113113
"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.15.0"},
114114
},
115+
"v1.16": {
116+
"aws": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.12.0"},
117+
"azure": {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.12.0"},
118+
"vsphere": {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
119+
"gcp": {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.12.0"},
120+
"datamover": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.12.0"},
121+
"velero": {"gcr.io/velero-gcp/velero:v1.15.0"},
122+
"velero-restore-helper": {"gcr.io/velero-gcp/velero:v1.16.0"},
123+
},
115124
"main": {
116125
"aws": {"gcr.io/velero-gcp/velero-plugin-for-aws:main"},
117126
"azure": {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:main"},

0 commit comments

Comments
 (0)