diff --git a/.circleci/config.yml b/.circleci/config.yml index f84aed3235..925adf6b24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,8 @@ executors: - image: docker.mirror.hashicorp.services/circleci/golang:1.17 environment: TEST_RESULTS: /tmp/test-results # path to where test results are saved - CONSUL_VERSION: 1.11.0-beta3 # Consul's OSS version to use in tests - CONSUL_ENT_VERSION: 1.11.0+ent-beta3 # Consul's enterprise version to use in tests + CONSUL_VERSION: 1.11.0-rc # Consul's OSS version to use in tests + CONSUL_ENT_VERSION: 1.11.0+ent-rc # Consul's enterprise version to use in tests control-plane-path : &control-plane-path control-plane cli-path : &cli-path cli diff --git a/acceptance/tests/controller/controller_namespaces_test.go b/acceptance/tests/controller/controller_namespaces_test.go index 483fc96106..b272247db4 100644 --- a/acceptance/tests/controller/controller_namespaces_test.go +++ b/acceptance/tests/controller/controller_namespaces_test.go @@ -74,7 +74,7 @@ func TestControllerNamespaces(t *testing.T) { ctx := suite.Environment().DefaultContext(t) helmValues := map[string]string{ - "global.image": "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296", + "global.image": "hashicorp/consul-enterprise:1.11.0-ent-rc", "global.enableConsulNamespaces": "true", "global.adminPartitions.enabled": "true", diff --git a/acceptance/tests/partitions/partitions_test.go b/acceptance/tests/partitions/partitions_test.go index 001a2f431c..357e2f6d85 100644 --- a/acceptance/tests/partitions/partitions_test.go +++ b/acceptance/tests/partitions/partitions_test.go @@ -96,7 +96,7 @@ func TestPartitions(t *testing.T) { serverHelmValues := map[string]string{ "global.datacenter": "dc1", - "global.image": "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296", + "global.image": "hashicorp/consul-enterprise:1.11.0-ent-rc", "global.adminPartitions.enabled": "true", "global.enableConsulNamespaces": "true", @@ -197,7 +197,7 @@ func TestPartitions(t *testing.T) { // Create client cluster. clientHelmValues := map[string]string{ "global.datacenter": "dc1", - "global.image": "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296", + "global.image": "hashicorp/consul-enterprise:1.11.0-ent-rc", "global.enabled": "false", "global.tls.enabled": "true", diff --git a/control-plane/controller/exportedservices_controller_ent_test.go b/control-plane/controller/exportedservices_controller_ent_test.go index 72acdabf2c..ec8f771586 100644 --- a/control-plane/controller/exportedservices_controller_ent_test.go +++ b/control-plane/controller/exportedservices_controller_ent_test.go @@ -31,7 +31,6 @@ import ( func TestExportedServicesController_createsExportedServices(tt *testing.T) { tt.Parallel() - tt.Skip() cases := map[string]struct { Mirror bool @@ -151,7 +150,6 @@ func TestExportedServicesController_createsExportedServices(tt *testing.T) { func TestExportedServicesController_updatesExportedServices(tt *testing.T) { tt.Parallel() - tt.Skip() cases := map[string]struct { Mirror bool @@ -294,7 +292,6 @@ func TestExportedServicesController_updatesExportedServices(tt *testing.T) { func TestExportedServicesController_deletesExportedServices(tt *testing.T) { tt.Parallel() - tt.Skip() cases := map[string]struct { Mirror bool