Try alternate approach for skipping ARM integration tests

Author: MDrakos

internal/testhelpers/tagsuite/tagsuite.go

@@ -96,8 +96,30 @@ type Suite struct {
 	suite.Suite
 }
 
+// ARM-supported tags for integration tests
+var armSupportedTags = []string{
+	Install,
+	Installer,
+	InstallScripts,
+	Update,
+}
+
 // OnlyRunForTags skips a test unless one of the given tags is asked for.
 func (suite *Suite) OnlyRunForTags(tags ...string) {
+	// Skip tests on ARM64 if they don't have an ARM-supported tag
+	if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" {
+		hasArmSupportedTag := false
+		for _, tag := range tags {
+			if funk.Contains(armSupportedTags, tag) {
+				hasArmSupportedTag = true
+				break
+			}
+		}
+		if !hasArmSupportedTag {
+			suite.T().Skipf("Skipping test on Linux/arm64 - only tags %s are supported", strings.Join(armSupportedTags, ", "))
+		}
+	}
+
 	setTagsString, _ := os.LookupEnv("TEST_SUITE_TAGS")
 
 	setTags := strings.Split(strings.ToLower(setTagsString), ":")
@@ -114,10 +136,3 @@ func (suite *Suite) OnlyRunForTags(tags ...string) {
 
 	suite.T().Skipf("Run only if any of the following tags are set: %s", strings.Join(tags, ", "))
 }
-
-// SkipUnsupportedArchitectures will skip tests for unsupported system architectures
-func (suite *Suite) SkipUnsupportedArchitectures() {
-	if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" {
-		suite.T().Skip("Skipping test on Linux/arm64 - platform not configured")
-	}
-}

test/integration/deploy_int_test.go

@@ -67,7 +67,6 @@ func (suite *DeployIntegrationTestSuite) deploy(ts *e2e.Session, prj string, tar
 
 func (suite *DeployIntegrationTestSuite) TestDeployPerl() {
 	suite.OnlyRunForTags(tagsuite.Perl, tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	if !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping DeployIntegrationTestSuite when not running on CI, as it modifies bashrc/registry")
 	}
@@ -144,7 +143,6 @@ func (suite *DeployIntegrationTestSuite) checkSymlink(name string, binDir, targe
 
 func (suite *DeployIntegrationTestSuite) TestDeployPython() {
 	suite.OnlyRunForTags(tagsuite.Deploy, tagsuite.Python, tagsuite.Critical)
-	suite.SkipUnsupportedArchitectures()
 	if !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping DeployIntegrationTestSuite when not running on CI, as it modifies bashrc/registry")
 	}
@@ -213,7 +211,6 @@ func (suite *DeployIntegrationTestSuite) TestDeployPython() {
 
 func (suite *DeployIntegrationTestSuite) TestDeployInstall() {
 	suite.OnlyRunForTags(tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	if !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping DeployIntegrationTestSuite when not running on CI, as it modifies bashrc/registry")
 	}
@@ -247,7 +244,6 @@ func (suite *DeployIntegrationTestSuite) InstallAndAssert(ts *e2e.Session, targe
 
 func (suite *DeployIntegrationTestSuite) TestDeployConfigure() {
 	suite.OnlyRunForTags(tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	if !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping TestDeployConfigure when not running on CI, as it modifies bashrc/registry")
 	}
@@ -316,7 +312,6 @@ func (suite *DeployIntegrationTestSuite) AssertConfig(ts *e2e.Session, targetID
 
 func (suite *DeployIntegrationTestSuite) TestDeploySymlink() {
 	suite.OnlyRunForTags(tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	if runtime.GOOS != "windows" && !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping TestDeploySymlink when not running on CI, as it modifies PATH")
 	}
@@ -354,7 +349,6 @@ func (suite *DeployIntegrationTestSuite) TestDeploySymlink() {
 
 func (suite *DeployIntegrationTestSuite) TestDeployReport() {
 	suite.OnlyRunForTags(tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
@@ -383,7 +377,6 @@ func (suite *DeployIntegrationTestSuite) TestDeployReport() {
 
 func (suite *DeployIntegrationTestSuite) TestDeployTwice() {
 	suite.OnlyRunForTags(tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	if runtime.GOOS == "darwin" || !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping TestDeployTwice when not running on CI or on MacOS, as it modifies PATH")
 	}
@@ -419,7 +412,6 @@ func (suite *DeployIntegrationTestSuite) TestDeployTwice() {
 
 func (suite *DeployIntegrationTestSuite) TestDeployUninstall() {
 	suite.OnlyRunForTags(tagsuite.Deploy)
-	suite.SkipUnsupportedArchitectures()
 	if !e2e.RunningOnCI() {
 		suite.T().Skipf("Skipping TestDeployUninstall when not running on CI, as it modifies bashrc/registry")
 	}

test/integration/use_int_test.go

@@ -23,7 +23,6 @@ type UseIntegrationTestSuite struct {
 
 func (suite *UseIntegrationTestSuite) TestUse() {
 	suite.OnlyRunForTags(tagsuite.Use)
-	suite.SkipUnsupportedArchitectures()
 
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
@@ -78,7 +77,6 @@ func (suite *UseIntegrationTestSuite) TestUse() {
 
 func (suite *UseIntegrationTestSuite) TestUseCwd() {
 	suite.OnlyRunForTags(tagsuite.Use)
-	suite.SkipUnsupportedArchitectures()
 
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
@@ -109,7 +107,6 @@ func (suite *UseIntegrationTestSuite) TestUseCwd() {
 
 func (suite *UseIntegrationTestSuite) TestReset() {
 	suite.OnlyRunForTags(tagsuite.Use)
-	suite.SkipUnsupportedArchitectures()
 
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
@@ -163,7 +160,6 @@ func (suite *UseIntegrationTestSuite) TestReset() {
 
 func (suite *UseIntegrationTestSuite) TestShow() {
 	suite.OnlyRunForTags(tagsuite.Use)
-	suite.SkipUnsupportedArchitectures()
 
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
@@ -218,7 +214,6 @@ func (suite *UseIntegrationTestSuite) TestShow() {
 
 func (suite *UseIntegrationTestSuite) TestSetupNotice() {
 	suite.OnlyRunForTags(tagsuite.Use)
-	suite.SkipUnsupportedArchitectures()
 
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
@@ -241,7 +236,6 @@ func (suite *UseIntegrationTestSuite) TestSetupNotice() {
 
 func (suite *UseIntegrationTestSuite) TestJSON() {
 	suite.OnlyRunForTags(tagsuite.Use, tagsuite.JSON)
-	suite.SkipUnsupportedArchitectures()
 
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()