diff --git a/testing/tofutf/APKBUILD b/testing/tofutf/APKBUILD index 6de38465b46adf3efd8fe26f40f29975a7fae839..98fb83da8816727b8bb9a84fc840b60d916ffa07 100644 --- a/testing/tofutf/APKBUILD +++ b/testing/tofutf/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Guy Godfroy <guy.godfroy@gugod.fr> # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=tofutf -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=0 pkgdesc="Open source alternative to Terraform Enterprise" url="https://docs.tofutf.io" -arch="all" +arch="x86_64 armhf armv7 aarch64" # terraform and opentofu pre-built binaries available only for those archs license="MPL-2.0" depends="tofutf-server tofutf-cli" makedepends="go" @@ -17,7 +17,6 @@ subpackages=" $pkgname-agent-openrc:agent_openrc " source="$pkgname-$pkgver.tar.gz::https://github.com/tofutf/tofutf/archive/refs/tags/v$pkgver.tar.gz - check_otf.patch tofutfd.initd tofutfd.confd tofutf-agent.initd @@ -33,13 +32,8 @@ build() { check() { # TestExecutor_execute: takes ages and then timeout - # internal/integration: this module tests need docker - # TestDownloader: lacks testdata for some architectures https://github.com/tofutf/tofutf/pull/241 - toskip="TestExecutor_execute" - if [ "$CARCH" != "x86_64" ] && [ "$CARCH" != "aarch64" ] - then - toskip="${toskip}|TestDownloader" - fi + # internal/integration, Test{Pool,DB}: needs docker + toskip="TestExecutor_execute|TestPool|TestDB" go test -skip "$toskip" $(go list ./... | grep -v internal/integration) } @@ -94,8 +88,7 @@ agent_openrc() { } sha512sums=" -d03d72a8ba63c30b0e14c404761722fc4bec86ba1dda2342f5721f392d3da68e676ad19c6d991a0375fe586c151fa3bdd5b421b408b5bb41ccbaee41e99f0f25 tofutf-0.9.1.tar.gz -9d075813376e129ccd3af97659c21a167c93feaa5418be0bfef05771294faf46a006bf80b2324f31a3353d7b0b2993ebeea423f56f28954021665adb5987994c check_otf.patch +1370f08a0593a629769b936765c5ff2aa617c5e4298c7a2743ffb42515ad7d43887496dc7d4194c607dc37b97062ba6f1542230b0a2b57c22392f6b28ccc606a tofutf-0.10.0.tar.gz 267f21cb6aa0879132b994ff0a965b97cd426bf624b44b7e960cbfa2438405f3cd46f29cc6d76781ffe85705e828cc408dd67655125b696588041f822f30d71d tofutfd.initd f917e6078a21adec9a16923490c9b90e4ab03da59d488c11e29319ded8dccb5904be50c0c04563aa8268bc82c9d4bf50d579436f936b07f9010a17e8e9a4de99 tofutfd.confd ae25de3409bc5e4ef8abb18eb2b2c56fc15ed57b272a2585e43e415e4a731c207c1c8349854a314ea0f5c2a9957d114ae6051d58de010cceb0b75ba67832912d tofutf-agent.initd diff --git a/testing/tofutf/check_otf.patch b/testing/tofutf/check_otf.patch deleted file mode 100644 index 1188dda3fe2673fa3dfeae395bc365a23b70b3d4..0000000000000000000000000000000000000000 --- a/testing/tofutf/check_otf.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/cmd/environment_variables_test.go b/cmd/environment_variables_test.go -index db0fddd..70750c9 100644 ---- a/cmd/environment_variables_test.go -+++ b/cmd/environment_variables_test.go -@@ -20,7 +20,7 @@ func TestSetFlagsFromEnvVariables(t *testing.T) { - t.Run("override flag with env var file", func(t *testing.T) { - fs := pflag.NewFlagSet("testing", pflag.ContinueOnError) - got := fs.String("foo", "default", "") -- t.Setenv("OTF_FOO_FILE", "./testdata/otf_foo_file") -+ t.Setenv("OTF_FOO_FILE", "./testdata/tofutf_foo_file") - require.NoError(t, SetFlagsFromEnvVariables(fs)) - require.NoError(t, fs.Parse(nil)) - assert.Equal(t, "big\nmultiline\nsecret\n", *got) -@@ -28,7 +28,7 @@ func TestSetFlagsFromEnvVariables(t *testing.T) { - t.Run("ignore env var for flag ending with _file", func(t *testing.T) { - fs := pflag.NewFlagSet("testing", pflag.ContinueOnError) - got := fs.String("foo_file", "default", "") -- t.Setenv("OTF_FOO_FILE_FILE", "./testdata/otf_foo_file") -+ t.Setenv("OTF_FOO_FILE_FILE", "./testdata/tofutf_foo_file") - require.NoError(t, SetFlagsFromEnvVariables(fs)) - require.NoError(t, fs.Parse(nil)) - assert.Equal(t, "default", *got) -diff --git a/cmd/tofutfd/main_test.go b/cmd/tofutfd/main_test.go -index 3f52155..b2e952d 100644 ---- a/cmd/tofutfd/main_test.go -+++ b/cmd/tofutfd/main_test.go -@@ -48,7 +48,7 @@ func TestHelp(t *testing.T) { - err := parseFlags(ctx, tt.args, got) - require.NoError(t, err) - -- assert.Regexp(t, `^otfd is the daemon component of the open terraforming framework.`, got.String()) -+ assert.Regexp(t, `^tofutfd is the daemon component of the opentofu tuft framework.`, got.String()) - }) - } - }