Remove integration test trying to upgrade FIPS to non-FIPS

Author: ycombinator

testing/integration/upgrade_standalone_fips_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade"
 	atesting "github.com/elastic/elastic-agent/pkg/testing"
 	"github.com/elastic/elastic-agent/pkg/testing/define"
 	"github.com/elastic/elastic-agent/pkg/version"
@@ -93,55 +92,6 @@ func TestStandaloneUpgradeFIPStoFIPS(t *testing.T) {
 	}
 }
 
-// TestStandaloneUpgradeFIPStoNonFIPS ensures that a FIPS-capable Agent
-// cannot be upgraded to a non-FIPS-capable Agent.
-func TestStandaloneUpgradeFIPStoNonFIPS(t *testing.T) {
-	define.Require(t, define.Requirements{
-		Group: StandaloneUpgrade,
-		Local: false, // requires Agent installation
-		Sudo:  true,  // requires Agent installation
-		OS: []define.OS{
-			{Type: define.Linux},
-		},
-	})
-
-	// Start with a FIPS-capable Agent artifact
-	fipsArtifactFetcher := atesting.ArtifactFetcher(atesting.WithArtifactFIPSOnly())
-
-	versionList, err := upgradetest.GetUpgradableVersions()
-	require.NoError(t, err)
-	endVersion, err := version.ParseVersion(define.Version())
-	require.NoError(t, err)
-
-	for _, startVersion := range versionList {
-		// We need to start the upgrade from a FIPS-capable version
-		if !isFIPSCapableVersion(startVersion) {
-			t.Logf(
-				"Minimum start version of FIPS-capable Agent for running this test is either %q or %q, current start version: %q",
-				*upgradetest.Version_8_19_0_SNAPSHOT,
-				*upgradetest.Version_9_1_0_SNAPSHOT,
-				startVersion,
-			)
-			continue
-		}
-
-		unprivilegedAvailable := false
-		if upgradetest.SupportsUnprivileged(startVersion, endVersion) {
-			unprivilegedAvailable = true
-		}
-		t.Run(fmt.Sprintf("Upgrade %s to %s (privileged)", startVersion, define.Version()), func(t *testing.T) {
-			upgradeOpts := []upgradetest.UpgradeOpt{upgradetest.WithUnprivileged(false)}
-			testStandaloneUpgradeFailed(t, startVersion, define.Version(), fipsArtifactFetcher, upgrade.ErrFipsToNonFips, upgradeOpts...)
-		})
-		if unprivilegedAvailable {
-			upgradeOpts := []upgradetest.UpgradeOpt{upgradetest.WithUnprivileged(true)}
-			t.Run(fmt.Sprintf("Upgrade %s to %s (unprivileged)", startVersion, define.Version()), func(t *testing.T) {
-				testStandaloneUpgradeFailed(t, startVersion, define.Version(), fipsArtifactFetcher, upgrade.ErrFipsToNonFips, upgradeOpts...)
-			})
-		}
-	}
-}
-
 func isFIPSCapableVersion(ver *version.ParsedSemVer) bool {
 	// Versions prior to 8.19.0-SNAPSHOT are not FIPS-capable
 	if ver.Less(*upgradetest.Version_8_19_0_SNAPSHOT) {

testing/integration/upgrade_standalone_test.go

@@ -50,17 +50,7 @@ func TestStandaloneUpgrade(t *testing.T) {
 	}
 }
 
-func testStandaloneUpgradeSucceeded(t *testing.T, startVersion *version.ParsedSemVer, endVersion string, fetcher atesting.Fetcher, upgradeOpts ...upgradetest.UpgradeOpt) {
-	assert.NoError(t, testStandaloneUpgrade(t, startVersion, endVersion, fetcher, upgradeOpts...))
-}
-
-func testStandaloneUpgradeFailed(t *testing.T, startVersion *version.ParsedSemVer, endVersion string, fetcher atesting.Fetcher, expectedErr error, upgradeOpts ...upgradetest.UpgradeOpt) {
-	err := testStandaloneUpgrade(t, startVersion, endVersion, fetcher, upgradeOpts...)
-	assert.NotNil(t, err)
-	assert.ErrorIs(t, err, expectedErr)
-}
-
-func testStandaloneUpgrade(t *testing.T, startVersion *version.ParsedSemVer, endVersion string, fetcher atesting.Fetcher, upgradeOpts ...upgradetest.UpgradeOpt) error {
+func testStandaloneUpgrade(t *testing.T, startVersion *version.ParsedSemVer, endVersion string, fetcher atesting.Fetcher, upgradeOpts ...upgradetest.UpgradeOpt) {
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 
@@ -80,8 +70,9 @@ func testStandaloneUpgrade(t *testing.T, startVersion *version.ParsedSemVer, end
 	require.NoError(t, err)
 	if startVersionInfo.Binary.Commit == endVersionInfo.Binary.Commit {
 		t.Skipf("both start and end versions have the same hash %q, skipping...", startVersionInfo.Binary.Commit)
-		return nil
+		return
 	}
 
-	return upgradetest.PerformUpgrade(ctx, startFixture, endFixture, t, upgradeOpts...)
+	err = upgradetest.PerformUpgrade(ctx, startFixture, endFixture, t, upgradeOpts...)
+	assert.NoError(t, err)
 }