Skip to content

Commit 2e0d09f

Browse files
author
kaanyalti
committed
enhancement(6394): use previous minor, fix log
1 parent 60d13dd commit 2e0d09f

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

pkg/testing/fixture_install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ func (f *Fixture) simpleInstallRPM(ctx context.Context) ([]byte, error) {
467467
// sudo apt-get install the deb
468468
out, err := exec.CommandContext(ctx, "sudo", "rpm", "-Uvh", f.srcPackage).CombinedOutput() // #nosec G204 -- Need to pass in name of package
469469
if err != nil {
470-
return out, fmt.Errorf("apt install failed: %w output:%s", err, string(out))
470+
return out, fmt.Errorf("rpm install failed: %w output:%s", err, string(out))
471471
}
472472

473473
socketPath := "unix:///var/lib/elastic-agent/elastic-agent.sock"

testing/integration/endpoint_security_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,8 @@ func getEndpointVersion(t *testing.T) string {
133133
// cleanup functions are set
134134
func testTamperProtectedDebRpmUpgrades(t *testing.T, info *define.Info, packageFormat string) {
135135
ctx := context.Background()
136-
upgradeables, err := upgradetest.GetUpgradableVersions()
136+
upgradeFromVersion, err := upgradetest.PreviousMinor()
137137
require.NoError(t, err)
138-
upgradeFromVersion := upgradeables[0]
139138
t.Logf("Preparing fixture with agent version %s", upgradeFromVersion.String())
140139

141140
startFixture, err := atesting.NewFixture(

0 commit comments

Comments
 (0)