Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip test while snapshot downloader cannot handle downgrades #3314

Merged
merged 1 commit into from
Aug 29, 2023
Merged

Skip test while snapshot downloader cannot handle downgrades #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions internal/pkg/agent/application/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ func (u *Upgrader) Upgrade(ctx context.Context, version string, sourceURI string
u.log.Errorw("Unable to clean downloads before update", "error.message", err, "downloads.path", paths.Downloads())
}

sourceURI = u.sourceURI(sourceURI)
if sourceURI != "" {
sourceURI = u.settings.SourceURI
}

archivePath, err := u.downloadArtifact(ctx, version, sourceURI, skipVerifyOverride, skipDefaultPgp, pgpBytes...)
if err != nil {
// Run the same pre-upgrade cleanup task to get rid of any newly downloaded files
Expand Down Expand Up @@ -214,14 +217,6 @@ func (u *Upgrader) Ack(ctx context.Context, acker acker.Acker) error {
return saveMarker(marker)
}

func (u *Upgrader) sourceURI(retrievedURI string) string {
if retrievedURI != "" {
return retrievedURI
}

return u.settings.SourceURI
}

func rollbackInstall(ctx context.Context, log *logger.Logger, hash string) {
os.RemoveAll(filepath.Join(paths.Data(), fmt.Sprintf("%s-%s", agentName, hash)))
_ = ChangeSymlink(ctx, log, release.ShortCommit())
Expand Down
13 changes: 8 additions & 5 deletions testing/integration/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,25 +217,28 @@ func TestStandaloneUpgrade(t *testing.T) {
}
}

func TestStandaloneUpgradeWithGPGFallback(t *testing.T) {
func TestStandaloneDowngradeWithGPGFallback(t *testing.T) {
define.Require(t, define.Requirements{
Local: false, // requires Agent installation
Sudo: true, // requires Agent installation
})

t.Skip("snapshot downloader has a bug which break this test between releases: " +
"https://github.com/elastic/elastic-agent/issues/3313")

minVersion := version_8_10_0_SNAPSHOT
parsedVersion, err := version.ParseVersion(define.Version())
fromVersion, err := version.ParseVersion(define.Version())
require.NoError(t, err)

if parsedVersion.Less(*minVersion) {
if fromVersion.Less(*minVersion) {
t.Skipf("Version %s is lower than min version %s", define.Version(), minVersion)
}

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

// previous
toVersion, err := parsedVersion.GetPreviousMinor()
toVersion, err := fromVersion.GetPreviousMinor()
require.NoError(t, err, "failed to get previous minor")
agentFixture, err := define.NewFixture(
t,
Expand All @@ -258,7 +261,7 @@ func TestStandaloneUpgradeWithGPGFallback(t *testing.T) {
1,
)

testStandaloneUpgrade(ctx, t, agentFixture, parsedVersion, toVersion, "", false, false, true, customPGP)
testStandaloneUpgrade(ctx, t, agentFixture, fromVersion, toVersion, "", false, false, true, customPGP)
}

func TestStandaloneDowngradeToPreviousSnapshotBuild(t *testing.T) {
Expand Down
Loading