Backport 1.16.x Upgrade test: remove outdated test and disable log due to verbosity (… (#18413)
Upgrade test: remove outdated test and disable log due to verbosity (#18403) * remove outdated test * disable log since we have too many parallel tests
This commit is contained in:
parent
fd5d0c4929
commit
97d44d170b
4
.github/workflows/test-integrations.yml
vendored
4
.github/workflows/test-integrations.yml
vendored
|
@ -538,7 +538,9 @@ jobs:
|
|||
-p=4 \
|
||||
-tags "${{ env.GOTAGS }}" \
|
||||
-timeout=30m \
|
||||
-json ./... \
|
||||
-json \
|
||||
./... \
|
||||
--follow-log=false \
|
||||
--target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
|
||||
--target-version local \
|
||||
--latest-image docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }} \
|
||||
|
|
|
@ -32,23 +32,6 @@ var (
|
|||
|
||||
// Test upgrade a cluster of latest version to the target version
|
||||
func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
|
||||
tcs = append(tcs,
|
||||
testcase{
|
||||
// Use the case of "1.12.3" ==> "1.13.0" to verify the test can
|
||||
// catch the upgrade bug found in snapshot of 1.13.0
|
||||
oldVersion: "1.12.3",
|
||||
targetVersion: "1.13.0",
|
||||
expectErr: true,
|
||||
},
|
||||
)
|
||||
|
||||
tcs = append(tcs, testcase{
|
||||
oldVersion: utils.LatestVersion,
|
||||
targetVersion: utils.TargetVersion,
|
||||
},
|
||||
)
|
||||
|
||||
run := func(t *testing.T, tc testcase) {
|
||||
const numServers = 1
|
||||
buildOpts := &libcluster.BuildOptions{
|
||||
ConsulImageName: utils.GetLatestImageName(),
|
||||
|
@ -100,10 +83,9 @@ func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
|
||||
// upgrade the cluster to the Target version
|
||||
t.Logf("initiating standard upgrade to version=%q", tc.targetVersion)
|
||||
err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion)
|
||||
t.Logf("initiating standard upgrade to version=%q", utils.TargetVersion)
|
||||
err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
|
||||
|
||||
if !tc.expectErr {
|
||||
require.NoError(t, err)
|
||||
libcluster.WaitForLeader(t, cluster, client)
|
||||
libcluster.WaitForMembers(t, client, numServers)
|
||||
|
@ -115,16 +97,4 @@ func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
|
|||
require.Len(r, service, 1)
|
||||
require.Equal(r, serviceName, service[0].ServiceName)
|
||||
})
|
||||
} else {
|
||||
require.ErrorContains(t, err, "context deadline exceeded")
|
||||
}
|
||||
}
|
||||
|
||||
for _, tc := range tcs {
|
||||
t.Run(fmt.Sprintf("upgrade from %s to %s", tc.oldVersion, tc.targetVersion),
|
||||
func(t *testing.T) {
|
||||
run(t, tc)
|
||||
})
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue