diff --git a/Makefile b/Makefile index a1a3822bb..9b6a76010 100644 --- a/Makefile +++ b/Makefile @@ -368,10 +368,10 @@ $(include_packages): --after-remove scripts/rpm/post-remove.sh \ --description "Plugin-driven server agent for reporting metrics into InfluxDB." \ --depends coreutils \ - --depends shadow-utils \ --rpm-digest sha256 \ --rpm-posttrans scripts/rpm/post-install.sh \ --rpm-os ${GOOS} \ + --rpm-tag "Requires(pre): /usr/sbin/useradd" \ --name telegraf \ --version $(version) \ --iteration $(rpm_iteration) \ diff --git a/tools/package_incus_test/container.go b/tools/package_incus_test/container.go index 0db184dae..eedb4eda8 100644 --- a/tools/package_incus_test/container.go +++ b/tools/package_incus_test/container.go @@ -82,7 +82,7 @@ func (c *Container) Install(packageName ...string) error { case "dnf": cmd = append([]string{"dnf", "install", "-y"}, packageName...) case "zypper": - cmd = append([]string{"zypper", "install", "-y"}, packageName...) + cmd = append([]string{"zypper", "--gpg-auto-import-keys", "install", "-y"}, packageName...) } err := c.client.Exec(c.Name, cmd...) @@ -247,7 +247,8 @@ func (c *Container) configureDnf() error { func (c *Container) configureZypper() error { err := c.client.Exec( c.Name, - "echo", fmt.Sprintf("%q", influxDataRPMRepo), ">", "/etc/zypp/repos.d/influxdata.repo", + "bash", "-c", "--", + fmt.Sprintf("echo -e %q > /etc/zypp/repos.d/influxdata.repo", influxDataRPMRepo), ) if err != nil { return err @@ -259,7 +260,7 @@ func (c *Container) configureZypper() error { "cat /etc/zypp/repos.d/influxdata.repo", ) - return c.client.Exec(c.Name, "zypper", "refresh") + return c.client.Exec(c.Name, "zypper", "--no-gpg-checks", "refresh") } // Determine if the system uses yum or apt for software @@ -285,6 +286,12 @@ func (c *Container) detectPackageManager() error { return nil } + err = c.client.Exec(c.Name, "which", "zypper") + if err == nil { + c.packageManager = "zypper" + return nil + } + return fmt.Errorf("unable to determine package manager") } diff --git a/tools/package_incus_test/main.go b/tools/package_incus_test/main.go index 88ab41519..47118d110 100644 --- a/tools/package_incus_test/main.go +++ b/tools/package_incus_test/main.go @@ -13,8 +13,7 @@ var imagesRPM = []string{ "fedora/39", "fedora/38", "centos/9-Stream", - //"opensuse/15.3", // shadow-utils dependency bug see #3833 - //"opensuse/tumbleweed", // shadow-utils dependency bug see #3833 + "opensuse/tumbleweed", } var imagesDEB = []string{