diff --git a/test/integration/consul-container/libs/topology/peering_topology.go b/test/integration/consul-container/libs/topology/peering_topology.go index 6e579db18cbea..87c2743f3d3de 100644 --- a/test/integration/consul-container/libs/topology/peering_topology.go +++ b/test/integration/consul-container/libs/topology/peering_topology.go @@ -44,6 +44,7 @@ type BuiltCluster struct { // It returns objects of the accepting cluster, dialing cluster, staticServerSvc, and staticClientSvcSidecar func BasicPeeringTwoClustersSetup( t *testing.T, + consulImage string, consulVersion string, peeringThroughMeshgateway bool, ) (*BuiltCluster, *BuiltCluster) { @@ -52,6 +53,7 @@ func BasicPeeringTwoClustersSetup( NumClients: 1, BuildOpts: &libcluster.BuildOptions{ Datacenter: "dc1", + ConsulImageName: consulImage, ConsulVersion: consulVersion, InjectAutoEncryption: true, }, @@ -63,6 +65,7 @@ func BasicPeeringTwoClustersSetup( NumClients: 1, BuildOpts: &libcluster.BuildOptions{ Datacenter: "dc2", + ConsulImageName: consulImage, ConsulVersion: consulVersion, InjectAutoEncryption: true, }, diff --git a/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go b/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go index 9a150d9696329..ccf5b206ce6d4 100644 --- a/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go +++ b/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go @@ -53,7 +53,7 @@ import ( func TestPeering_RotateServerAndCAThenFail_(t *testing.T) { t.Parallel() - accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.TargetVersion, false) + accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetTargetImageName(), utils.TargetVersion, false) var ( acceptingCluster = accepting.Cluster dialingCluster = dialing.Cluster diff --git a/test/integration/consul-container/test/upgrade/acl_node_test.go b/test/integration/consul-container/test/upgrade/acl_node_test.go index 345f06fd733f0..94886a4e27a42 100644 --- a/test/integration/consul-container/test/upgrade/acl_node_test.go +++ b/test/integration/consul-container/test/upgrade/acl_node_test.go @@ -27,6 +27,7 @@ func TestACL_NodeToken(t *testing.T) { NumClients: 1, BuildOpts: &libcluster.BuildOptions{ Datacenter: "dc1", + ConsulImageName: utils.GetLatestImageName(), ConsulVersion: utils.LatestVersion, InjectAutoEncryption: false, ACLEnabled: true, diff --git a/test/integration/consul-container/test/upgrade/basic_test.go b/test/integration/consul-container/test/upgrade/basic_test.go index e406558dc4590..e9483f1116936 100644 --- a/test/integration/consul-container/test/upgrade/basic_test.go +++ b/test/integration/consul-container/test/upgrade/basic_test.go @@ -22,8 +22,8 @@ func TestBasic(t *testing.T) { t.Parallel() configCtx := libcluster.NewBuildContext(t, libcluster.BuildOptions{ - ConsulImageName: utils.GetTargetImageName(), - ConsulVersion: utils.TargetVersion, + ConsulImageName: utils.GetLatestImageName(), + ConsulVersion: utils.LatestVersion, }) const numServers = 1 @@ -32,7 +32,7 @@ func TestBasic(t *testing.T) { Bootstrap(numServers). ToAgentConfig(t) t.Logf("Cluster config:\n%s", serverConf.JSON) - require.Equal(t, utils.TargetVersion, serverConf.Version) // TODO: remove + require.Equal(t, utils.LatestVersion, serverConf.Version) // TODO: remove cluster, err := libcluster.NewN(t, *serverConf, numServers) require.NoError(t, err) diff --git a/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go b/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go index 2874711272d23..873eabcf0e4fb 100644 --- a/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go +++ b/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go @@ -25,8 +25,9 @@ func TestIngressGateway_GRPC_UpgradeToTarget_fromLatest(t *testing.T) { NumServers: 1, NumClients: 1, BuildOpts: &libcluster.BuildOptions{ - Datacenter: "dc1", - ConsulVersion: utils.LatestVersion, + Datacenter: "dc1", + ConsulImageName: utils.GetLatestImageName(), + ConsulVersion: utils.LatestVersion, }, ApplyDefaultProxySettings: true, }) diff --git a/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go b/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go index 03b8ca3ac73e4..52ee91bac8fcc 100644 --- a/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go +++ b/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go @@ -41,8 +41,9 @@ func TestIngressGateway_SDS_UpgradeToTarget_fromLatest(t *testing.T) { NumServers: 1, NumClients: 2, BuildOpts: &libcluster.BuildOptions{ - Datacenter: "dc1", - ConsulVersion: utils.LatestVersion, + Datacenter: "dc1", + ConsulImageName: utils.GetLatestImageName(), + ConsulVersion: utils.LatestVersion, }, ApplyDefaultProxySettings: true, }) diff --git a/test/integration/consul-container/test/upgrade/ingress_gateway_test.go b/test/integration/consul-container/test/upgrade/ingress_gateway_test.go index 943a854a00754..c0acfeb775b5b 100644 --- a/test/integration/consul-container/test/upgrade/ingress_gateway_test.go +++ b/test/integration/consul-container/test/upgrade/ingress_gateway_test.go @@ -49,8 +49,9 @@ func TestIngressGateway_UpgradeToTarget_fromLatest(t *testing.T) { NumServers: 1, NumClients: 2, BuildOpts: &libcluster.BuildOptions{ - Datacenter: "dc1", - ConsulVersion: utils.LatestVersion, + Datacenter: "dc1", + ConsulImageName: utils.GetLatestImageName(), + ConsulVersion: utils.LatestVersion, }, ApplyDefaultProxySettings: true, }) diff --git a/test/integration/consul-container/test/upgrade/peering_control_plane_mgw_test.go b/test/integration/consul-container/test/upgrade/peering_control_plane_mgw_test.go index 82f71444f830c..4e9355657fa57 100644 --- a/test/integration/consul-container/test/upgrade/peering_control_plane_mgw_test.go +++ b/test/integration/consul-container/test/upgrade/peering_control_plane_mgw_test.go @@ -27,7 +27,7 @@ import ( func TestPeering_ControlPlaneMGW(t *testing.T) { t.Parallel() - accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.LatestVersion, true) + accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion, true) var ( acceptingCluster = accepting.Cluster dialingCluster = dialing.Cluster diff --git a/test/integration/consul-container/test/upgrade/peering_http_test.go b/test/integration/consul-container/test/upgrade/peering_http_test.go index 2bf0d93f42705..e1cffe4700c12 100644 --- a/test/integration/consul-container/test/upgrade/peering_http_test.go +++ b/test/integration/consul-container/test/upgrade/peering_http_test.go @@ -20,14 +20,14 @@ import ( func TestPeering_Basic(t *testing.T) { t.Parallel() - accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.LatestVersion, false) + accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion, false) peeringUpgrade(t, accepting, dialing, utils.TargetVersion) peeringPostUpgradeValidation(t, dialing) } func TestPeering_HTTPRouter(t *testing.T) { t.Parallel() - accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.LatestVersion, false) + accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion, false) acceptingCluster := accepting.Cluster // Create a second static-server at the client agent of accepting cluster and @@ -90,7 +90,7 @@ func TestPeering_HTTPRouter(t *testing.T) { func TestPeering_HTTPResolverAndFailover(t *testing.T) { t.Parallel() - accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.LatestVersion, false) + accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion, false) dialingCluster := dialing.Cluster require.NoError(t, dialingCluster.ConfigEntryWrite(&api.ProxyConfigEntry{ @@ -183,7 +183,7 @@ func TestPeering_HTTPResolverAndFailover(t *testing.T) { func TestPeering_HTTPResolverAndSplitter(t *testing.T) { t.Parallel() - accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.LatestVersion, false) + accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion, false) dialingCluster := dialing.Cluster require.NoError(t, dialingCluster.ConfigEntryWrite(&api.ProxyConfigEntry{