fix(rpm): Resolve nightly rpm tests (#13884)

This commit is contained in:
Joshua Powers 2023-09-07 12:46:43 -06:00 committed by GitHub
parent ce6e4b4d63
commit 3607519a40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions

View File

@ -20,7 +20,8 @@ if [[ ! -d /etc/telegraf/telegraf.d ]]; then
fi
# If 'telegraf.conf' is not present use package's sample (fresh install)
if [[ ! -f /etc/telegraf/telegraf.conf ]] && [[ -f /etc/telegraf/telegraf.conf.sample ]]; then
if [[ ! -f /etc/telegraf/telegraf.conf ]] && [[ ! -f /etc/telegraf/telegraf.conf.rpmnew ]] &&
[[ ! -f /etc/telegraf/telegraf.conf.rpmsave ]] && [[ -f /etc/telegraf/telegraf.conf.sample ]]; then
cp /etc/telegraf/telegraf.conf.sample /etc/telegraf/telegraf.conf
chmod 640 /etc/telegraf/telegraf.conf
chmod 750 /etc/telegraf/telegraf.d

View File

@ -107,6 +107,17 @@ func (c *Container) CheckStatus(serviceName string) error {
return err
}
err = c.client.Exec(
c.Name,
"bash",
"-c",
"--",
"ls -la /etc/telegraf/",
)
if err != nil {
return err
}
err = c.client.Exec(c.Name, "systemctl", "start", serviceName)
if err != nil {
_ = c.client.Exec(c.Name, "systemctl", "status", serviceName)

View File

@ -36,6 +36,7 @@ func main() {
Name: "package",
Usage: ".deb or .rpm file for upgrade testing",
Destination: &packageFile,
Required: true,
},
&cli.StringFlag{
Name: "image",
@ -44,6 +45,10 @@ func main() {
},
},
Action: func(c *cli.Context) error {
if _, err := os.Stat(packageFile); err != nil {
return fmt.Errorf("unknown package file: %w", err)
}
if image != "" && packageFile != "" {
fmt.Printf("test package %q on image %q\n", packageFile, image)
return launchTests(packageFile, []string{image})
@ -61,7 +66,7 @@ func main() {
}
}
return fmt.Errorf("please provide at least a package to test")
return nil
},
}