Skip to content

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
@ycombinator
ycombinator committed Sep 26, 2023
1 parent 3f30c30 commit 3fa5374
Showing 1 changed file with 77 additions and 70 deletions.
147 changes: 77 additions & 70 deletions testing/integration/upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,55 +474,11 @@ func testStandaloneUpgrade(
t.Logf("Agent installation output: %q", string(output))
require.NoError(t, err)

c := f.Client()

err = c.Connect(ctx)
require.NoError(t, err, "error connecting client to agent")
defer c.Disconnect()

require.Eventually(t, func() bool {
return checkAgentHealthAndVersion(t, ctx, f, parsedFromVersion.CoreVersion(), parsedFromVersion.IsSnapshot(), "")
}, 2*time.Minute, 10*time.Second, "Agent never became healthy")

t.Logf("Upgrading from version %q to version %q", parsedFromVersion, parsedUpgradeVersion)

upgradeCmdArgs := []string{"upgrade", parsedUpgradeVersion.String()}

useLocalPackage := allowLocalPackage && version_8_7_0.Less(*parsedFromVersion)
if useLocalPackage {
// if we are upgrading from a version > 8.7.0 (min version to skip signature verification) we pass :
// - a file:// sourceURI pointing the agent package under test
// - flag --skip-verify to bypass pgp signature verification (we don't produce signatures for PR/main builds)
tof, err := define.NewFixture(t, parsedUpgradeVersion.String())
require.NoError(t, err)

srcPkg, err := tof.SrcPackage(ctx)
require.NoError(t, err)
sourceURI := "file://" + filepath.Dir(srcPkg)
t.Logf("setting sourceURI to : %q", sourceURI)
upgradeCmdArgs = append(upgradeCmdArgs, "--source-uri", sourceURI)
}
if useLocalPackage || skipVerify {
upgradeCmdArgs = append(upgradeCmdArgs, "--skip-verify")
}

if skipDefaultPgp {
upgradeCmdArgs = append(upgradeCmdArgs, "--skip-default-pgp")
}

if len(customPgp.PGP) > 0 {
upgradeCmdArgs = append(upgradeCmdArgs, "--pgp", customPgp.PGP)
}

if len(customPgp.PGPUri) > 0 {
upgradeCmdArgs = append(upgradeCmdArgs, "--pgp-uri", customPgp.PGPUri)
}

if len(customPgp.PGPPath) > 0 {
upgradeCmdArgs = append(upgradeCmdArgs, "--pgp-path", customPgp.PGPPath)
}

upgradeTriggerOutput, err := f.Exec(ctx, upgradeCmdArgs)
upgradeTriggerOutput, err := upgradeAgent(ctx, t, f, parsedFromVersion, parsedUpgradeVersion, allowLocalPackage, skipVerify, skipDefaultPgp, customPgp)
require.NoErrorf(t, err, "error triggering agent upgrade to version %q, output:\n%s",
parsedUpgradeVersion, upgradeTriggerOutput)

Expand All @@ -533,6 +489,12 @@ func testStandaloneUpgrade(
checkUpgradeWatcherRan(t, f, parsedFromVersion)

if expectedAgentHashAfterUpgrade != "" {
c := f.Client()

err = c.Connect(ctx)
require.NoError(t, err, "error connecting client to agent")
defer c.Disconnect()

aVersion, err := c.Version(ctx)
assert.NoError(t, err, "error checking version after upgrade")
assert.Equal(t, expectedAgentHashAfterUpgrade, aVersion.Commit, "agent commit hash changed after upgrade")
Expand Down Expand Up @@ -689,10 +651,9 @@ func TestStandaloneUpgradeRetryDownload(t *testing.T) {
// We go back TWO minors because sometimes we are in a situation where
// the current version has been advanced to the next release (e.g. 8.10.0)
// but the version before that (e.g. 8.9.0) hasn't been released yet.
previousVersion, err := upgradeFromVersion.GetPreviousMinor()
require.NoError(t, err)
previousVersion, err = previousVersion.GetPreviousMinor()
require.NoError(t, err)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
previousVersion := twoMinorsPrevious(t, ctx)

// For testing the upgrade we actually perform a downgrade
upgradeToVersion := previousVersion
Expand All @@ -702,9 +663,6 @@ func TestStandaloneUpgradeRetryDownload(t *testing.T) {
agentFixture, err := define.NewFixture(t, define.Version())
require.NoError(t, err)

ctx, cancel := context.WithCancel(context.Background())
defer cancel()

err = agentFixture.Prepare(ctx)
require.NoError(t, err, "error preparing agent fixture")

Expand Down Expand Up @@ -759,7 +717,7 @@ func TestStandaloneUpgradeRetryDownload(t *testing.T) {
go func() {
wg.Add(1)

err := upgradeAgent(ctx, toVersion, agentFixture, t.Log)
_, err := upgradeAgent(ctx, t, agentFixture, upgradeFromVersion, upgradeToVersion, false, false, false, CustomPGP{})

wg.Done()
require.NoError(t, err)
Expand Down Expand Up @@ -834,15 +792,63 @@ func restoreEtcHosts() error {
return cmd.Run()
}

func upgradeAgent(ctx context.Context, version string, agentFixture *atesting.Fixture, log func(args ...any)) error {
args := []string{"upgrade", version}
output, err := agentFixture.Exec(ctx, args)
if err != nil {
log("Upgrade command output after error: ", string(output))
return err
func upgradeAgent(
ctx context.Context,
t *testing.T,
agentFixture *atesting.Fixture,
parsedFromVersion *version.ParsedSemVer,
parsedToVersion *version.ParsedSemVer,
allowLocalPackage bool,
skipVerify bool,
skipDefaultPgp bool,
customPgp CustomPGP,
) ([]byte, error) {
t.Helper()

c := agentFixture.Client()

err := c.Connect(ctx)
require.NoError(t, err, "error connecting client to agent")
defer c.Disconnect()

t.Logf("Upgrading from version %q to version %q", parsedFromVersion, parsedToVersion)
upgradeCmdArgs := []string{"upgrade", parsedToVersion.String()}

useLocalPackage := allowLocalPackage && version_8_7_0.Less(*parsedFromVersion)
if useLocalPackage {
// if we are upgrading from a version > 8.7.0 (min version to skip signature verification) we pass :
// - a file:// sourceURI pointing the agent package under test
// - flag --skip-verify to bypass pgp signature verification (we don't produce signatures for PR/main builds)
tof, err := define.NewFixture(t, parsedToVersion.String())
require.NoError(t, err)

srcPkg, err := tof.SrcPackage(ctx)
require.NoError(t, err)
sourceURI := "file://" + filepath.Dir(srcPkg)
t.Logf("setting sourceURI to : %q", sourceURI)
upgradeCmdArgs = append(upgradeCmdArgs, "--source-uri", sourceURI)
}
if useLocalPackage || skipVerify {
upgradeCmdArgs = append(upgradeCmdArgs, "--skip-verify")
}

if skipDefaultPgp {
upgradeCmdArgs = append(upgradeCmdArgs, "--skip-default-pgp")
}

if len(customPgp.PGP) > 0 {
upgradeCmdArgs = append(upgradeCmdArgs, "--pgp", customPgp.PGP)
}

if len(customPgp.PGPUri) > 0 {
upgradeCmdArgs = append(upgradeCmdArgs, "--pgp-uri", customPgp.PGPUri)
}

if len(customPgp.PGPPath) > 0 {
upgradeCmdArgs = append(upgradeCmdArgs, "--pgp-path", customPgp.PGPPath)
}

return nil
return agentFixture.Exec(ctx, upgradeCmdArgs)
}

func TestUpgradeBrokenPackageVersion(t *testing.T) {
Expand Down Expand Up @@ -1057,11 +1063,10 @@ func TestStandaloneUpgradeFailsWhenUpgradeIsInProgress(t *testing.T) {
// than the current version and upgrade to the current version. Then we attempt
// upgrading to the current version again, expecting Elastic Agent to disallow
// this second upgrade.

ctx, cancel := context.WithCancel(context.Background())
defer cancel()

upgradeFromVersion := twoMinorsPrevious(t, ctx)

upgradeToVersion, err := version.ParseVersion(define.Version())
require.NoError(t, err)

Expand All @@ -1088,23 +1093,25 @@ func TestStandaloneUpgradeFailsWhenUpgradeIsInProgress(t *testing.T) {

// Upgrade Elastic Agent via commandline
toVersion := upgradeToVersion.String()
t.Logf("Upgrading Agent to %s for the first time", toVersion)
var wg sync.WaitGroup
wg.Add(1)
go func() {
wg.Add(1)

err := upgradeAgent(ctx, toVersion, agentFixture, t.Log)
defer wg.Done()

wg.Done()
t.Logf("Upgrading Agent to %s for the first time", toVersion)
_, err := upgradeAgent(ctx, t, agentFixture, upgradeFromVersion, upgradeToVersion, true, true, false, CustomPGP{})
require.NoError(t, err)
}()

wg.Wait()

// Attempt to upgrade Elastic Agent again, while upgrade is still in progress
// Attempt to upgrade Elastic Agent again, while upgrade is still in progress. The
// Upgrade Watcher from the previous upgrade attempt should still be running at this
// point, so Elastic Agent should prevent this second upgrade attempt.
t.Logf("Attempting to upgrade Agent again to %s", toVersion)
err = upgradeAgent(ctx, toVersion, agentFixture, t.Log)
require.Equal(t, "an upgrade is already in progress; please try again later.", err.Error())
output, err = upgradeAgent(ctx, t, agentFixture, upgradeToVersion, upgradeToVersion, true, true, false, CustomPGP{})
require.NotNil(t, err)
require.Contains(t, string(output), "an upgrade is already in progress; please try again later.")
}

func twoMinorsPrevious(t *testing.T, ctx context.Context) *version.ParsedSemVer {
Expand Down

0 comments on commit 3fa5374

Please sign in to comment.