remove comments and modify config file

hashicorp · Mar 8, 2023 · 6960228 · 6960228
1 parent 9d1afc9
commit 6960228
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -967,7 +967,6 @@ jobs:
               COMPOSE_INTERACTIVE_NO_CLI: 1
               # tput complains if this isn't set to something.
               TERM: ansi
-              GOTAGS: "consulent" #GO TAGS for enterprise integration tests
         - store_test_results:
             path: *TEST_RESULTS_DIR
         - store_artifacts:

diff --git a/test/integration/consul-container/libs/cluster/cluster.go b/test/integration/consul-container/libs/cluster/cluster.go
@@ -140,7 +140,6 @@ func (c *Cluster) Add(configs []Config, serfJoin bool, ports ...int) (xe error)
 		if err != nil {
 			return fmt.Errorf("container %d: %w", idx, err)
 		}
-
 		agents = append(agents, n)
 		c.Index++
 	}

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
@@ -12,7 +12,6 @@ import (
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
 	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/hashicorp/go-version"
 )
 
 // TestPeering_Upgrade_ControlPlane_MGW verifies the peering control plane traffic go through the mesh gateway
@@ -89,12 +88,6 @@ func TestPeering_Upgrade_ControlPlane_MGW(t *testing.T) {
 		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
 	}
 
-	fromVersion, err := version.NewVersion(utils.LatestVersion)
-	require.NoError(t, err)
-	if fromVersion.LessThan(utils.Version_1_14) {
-		return
-	}
-
 	t.Run(fmt.Sprintf("Upgrade from %s to %s", utils.LatestVersion, utils.TargetVersion),
 		func(t *testing.T) {
 			run(t, utils.LatestVersion, utils.TargetVersion)

diff --git a/test/integration/consul-container/test/upgrade/peering_http_test.go b/test/integration/consul-container/test/upgrade/peering_http_test.go
@@ -13,7 +13,6 @@ import (
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
 	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/hashicorp/go-version"
 )
 
 // TestPeering_UpgradeToTarget_fromLatest checks peering status after dialing cluster
@@ -375,14 +374,6 @@ func TestPeering_UpgradeToTarget_fromLatest(t *testing.T) {
 	}
 
 	for _, tc := range tcs {
-		//  TODO: SKIP upgrade test of peering for version 1.13 sinceAPI
-		//  changed from 1.13 to 1.14 in , PeerName to Peer in
-		//  exportConfigEntry
-		fromVersion, err := version.NewVersion(utils.LatestVersion)
-		require.NoError(t, err)
-		if fromVersion.LessThan(utils.Version_1_14) {
-			continue
-		}
 		t.Run(fmt.Sprintf("%s upgrade from %s to %s", tc.name, utils.LatestVersion, utils.TargetVersion),
 			func(t *testing.T) {
 				run(t, tc, utils.LatestVersion, utils.TargetVersion)