kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-06-20 20:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
2eeb464946
luet/pkg/installer/repository_test.go

581 lines
22 KiB
Go
Raw Normal View History

Split up repository generators
2021-04-08 13:22:18 +00:00
// Copyright © 2019 Ettore Di Giacinto <mudler@sabayon.org>
Add repository test file
2019-11-23 14:43:14 +00:00
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this program; if not, see <http://www.gnu.org/licenses/>.
package installer_test
import (
// . "github.com/mudler/luet/pkg/installer"
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
"fmt"
Add repository test file
2019-11-23 14:43:14 +00:00
"io/ioutil"
"os"
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
"path/filepath"
Add repository test file
2019-11-23 14:43:14 +00:00
Make repositories arch-aware Introduce an arch field that can be used to filter repositories based on the local architecture. If arch is provided and matching with the current GOARCH then the repository is enabled
2021-10-19 11:05:25 +00:00
"github.com/mudler/luet/pkg/api/core/types"
Add repository test file
2019-11-23 14:43:14 +00:00
"github.com/mudler/luet/pkg/compiler"
backend "github.com/mudler/luet/pkg/compiler/backend"
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
artifact "github.com/mudler/luet/pkg/compiler/types/artifact"
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
compilerspec "github.com/mudler/luet/pkg/compiler/types/spec"
Add repository test file
2019-11-23 14:43:14 +00:00
"github.com/mudler/luet/pkg/helpers"
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
fileHelper "github.com/mudler/luet/pkg/helpers/file"
Add repository test file
2019-11-23 14:43:14 +00:00
. "github.com/mudler/luet/pkg/installer"
pkg "github.com/mudler/luet/pkg/package"
"github.com/mudler/luet/pkg/tree"
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Add repository test file
2019-11-23 14:43:14 +00:00
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
func dockerStubRepo(tmpdir, tree, image string, push, force bool) (*LuetSystemRepository, error) {
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
return GenerateRepository(
Update tests for including packages in tree from metadata Also switches GenerateRepository to functional interface to allow more parametrization
2021-09-16 10:58:12 +00:00
WithName("test"),
WithDescription("description"),
WithType("docker"),
WithUrls(image),
WithPriority(1),
WithSource(tmpdir),
WithTree(tree),
WithDatabase(pkg.NewInMemoryDatabase(false)),
WithCompilerBackend(backend.NewSimpleDockerBackend()),
WithImagePrefix(image),
WithPushImages(push),
WithForce(force))
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
}
Add repository test file
2019-11-23 14:43:14 +00:00
var _ = Describe("Repository", func() {
Context("Generation", func() {
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
It("Generate repository metadata", func() {
tmpdir, err := ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe.Load("../../tests/fixtures/buildable")
Expect(err).ToNot(HaveOccurred())
Expect(len(generalRecipe.GetDatabase().GetPackages())).To(Equal(3))
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
compiler := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe.GetDatabase())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
spec, err := compiler.FromPackage(&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"})
Expect(err).ToNot(HaveOccurred())
Expect(spec.GetPackage().GetPath()).ToNot(Equal(""))
tmpdir, err = ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
Adapt fixtures and tests
2020-12-12 11:10:24 +00:00
Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
spec.SetOutputPath(tmpdir)
artifact, err := compiler.Compile(false, spec)
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(artifact.Path)).To(BeTrue())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(helpers.Untar(artifact.Path, tmpdir, false)).ToNot(HaveOccurred())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel("test5"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("test6"))).To(BeTrue())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
content1, err := fileHelper.Read(spec.Rel("test5"))
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
content2, err := fileHelper.Read(spec.Rel("test6"))
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Expect(err).ToNot(HaveOccurred())
Expect(content1).To(Equal("artifact5\n"))
Expect(content2).To(Equal("artifact6\n"))
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel("b-test-1.0.package.tar"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("b-test-1.0.metadata.yaml"))).To(BeTrue())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Adapt tests to new constructor changes
2021-01-20 16:24:22 +00:00
repo, err := stubRepo(tmpdir, "../../tests/fixtures/buildable")
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Expect(err).ToNot(HaveOccurred())
Expect(repo.GetName()).To(Equal("test"))
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).ToNot(BeTrue())
Generate repository metadata and packages for docker repository type Drop image-repository on create-repo. In case of a docker repository, --output is the image reference to use. Also restore default output build dir. See also: #169
2021-01-18 16:58:32 +00:00
err = repo.Write(tmpdir, false, true)
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).To(BeTrue())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
})
It("Generate repository metadata of files ONLY referenced in a tree", func() {
Add repository test file
2019-11-23 14:43:14 +00:00
tmpdir, err := ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe.Load("../../tests/fixtures/buildable")
Expect(err).ToNot(HaveOccurred())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
generalRecipe2 := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe2.Load("../../tests/fixtures/finalizers")
Expect(err).ToNot(HaveOccurred())
Expect(len(generalRecipe2.GetDatabase().GetPackages())).To(Equal(1))
Adapt installer to new changes
2019-11-29 18:01:52 +00:00
Expect(len(generalRecipe.GetDatabase().GetPackages())).To(Equal(3))
Add repository test file
2019-11-23 14:43:14 +00:00
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
compiler2 := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe2.GetDatabase())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
spec2, err := compiler2.FromPackage(&pkg.DefaultPackage{Name: "alpine", Category: "seed", Version: "1.0"})
Expect(err).ToNot(HaveOccurred())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
compiler := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe.GetDatabase())
Add repository test file
2019-11-23 14:43:14 +00:00
spec, err := compiler.FromPackage(&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"})
Expect(err).ToNot(HaveOccurred())
Expect(spec.GetPackage().GetPath()).ToNot(Equal(""))
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Expect(spec2.GetPackage().GetPath()).ToNot(Equal(""))
Add repository test file
2019-11-23 14:43:14 +00:00
tmpdir, err = ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
Adapt fixtures and tests
2020-12-12 11:10:24 +00:00
Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
Add repository test file
2019-11-23 14:43:14 +00:00
spec.SetOutputPath(tmpdir)
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
spec2.SetOutputPath(tmpdir)
Consume concurrency from compiler Refers to #33
2019-12-30 13:46:45 +00:00
artifact, err := compiler.Compile(false, spec)
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(artifact.Path)).To(BeTrue())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(helpers.Untar(artifact.Path, tmpdir, false)).ToNot(HaveOccurred())
Add repository test file
2019-11-23 14:43:14 +00:00
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
artifact2, err := compiler2.Compile(false, spec2)
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(artifact2.Path)).To(BeTrue())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(helpers.Untar(artifact2.Path, tmpdir, false)).ToNot(HaveOccurred())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel("test5"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("test6"))).To(BeTrue())
Add repository test file
2019-11-23 14:43:14 +00:00
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
content1, err := fileHelper.Read(spec.Rel("test5"))
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
content2, err := fileHelper.Read(spec.Rel("test6"))
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Expect(content1).To(Equal("artifact5\n"))
Expect(content2).To(Equal("artifact6\n"))
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel("b-test-1.0.package.tar"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("b-test-1.0.metadata.yaml"))).To(BeTrue())
Expect(fileHelper.Exists(spec2.Rel("alpine-seed-1.0.package.tar"))).To(BeTrue())
Expect(fileHelper.Exists(spec2.Rel("alpine-seed-1.0.metadata.yaml"))).To(BeTrue())
Add repository test file
2019-11-23 14:43:14 +00:00
Adapt tests to new constructor changes
2021-01-20 16:24:22 +00:00
repo, err := stubRepo(tmpdir, "../../tests/fixtures/buildable")
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Expect(repo.GetName()).To(Equal("test"))
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).ToNot(BeTrue())
Generate repository metadata and packages for docker repository type Drop image-repository on create-repo. In case of a docker repository, --output is the image reference to use. Also restore default output build dir. See also: #169
2021-01-18 16:58:32 +00:00
err = repo.Write(tmpdir, false, true)
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).To(BeTrue())
Add test to be sure we don't index packages not in the tree
2020-05-01 09:47:49 +00:00
// We check now that the artifact not referenced in the tree
// (spec2) is not indexed in the repository
repository, err := NewLuetSystemRepositoryFromYaml([]byte(`
name: "test"
type: "disk"
urls:
- "`+tmpdir+`"
`), pkg.NewInMemoryDatabase(false))
Expect(err).ToNot(HaveOccurred())
repos, err := repository.Sync(true)
Expect(err).ToNot(HaveOccurred())
_, err = repos.GetTree().GetDatabase().FindPackage(spec.GetPackage())
Expect(err).ToNot(HaveOccurred())
_, err = repos.GetTree().GetDatabase().FindPackage(spec2.GetPackage())
Expect(err).To(HaveOccurred()) // should throw error
Add repository test file
2019-11-23 14:43:14 +00:00
})
Update tests for including packages in tree from metadata Also switches GenerateRepository to functional interface to allow more parametrization
2021-09-16 10:58:12 +00:00
It("Generate repository metadata of files referenced in a tree and from packages", func() {
tmpdir, err := ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe.Load("../../tests/fixtures/buildable")
Expect(err).ToNot(HaveOccurred())
generalRecipe2 := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe2.Load("../../tests/fixtures/finalizers")
Expect(err).ToNot(HaveOccurred())
Expect(len(generalRecipe2.GetDatabase().GetPackages())).To(Equal(1))
Expect(len(generalRecipe.GetDatabase().GetPackages())).To(Equal(3))
compiler2 := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe2.GetDatabase())
spec2, err := compiler2.FromPackage(&pkg.DefaultPackage{Name: "alpine", Category: "seed", Version: "1.0"})
Expect(err).ToNot(HaveOccurred())
compiler := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe.GetDatabase())
spec, err := compiler.FromPackage(&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"})
Expect(err).ToNot(HaveOccurred())
Expect(spec.GetPackage().GetPath()).ToNot(Equal(""))
Expect(spec2.GetPackage().GetPath()).ToNot(Equal(""))
tmpdir, err = ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
spec.SetOutputPath(tmpdir)
spec2.SetOutputPath(tmpdir)
artifact, err := compiler.Compile(false, spec)
Expect(err).ToNot(HaveOccurred())
Expect(fileHelper.Exists(artifact.Path)).To(BeTrue())
Expect(helpers.Untar(artifact.Path, tmpdir, false)).ToNot(HaveOccurred())
artifact2, err := compiler2.Compile(false, spec2)
Expect(err).ToNot(HaveOccurred())
Expect(fileHelper.Exists(artifact2.Path)).To(BeTrue())
Expect(helpers.Untar(artifact2.Path, tmpdir, false)).ToNot(HaveOccurred())
Expect(fileHelper.Exists(spec.Rel("test5"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("test6"))).To(BeTrue())
content1, err := fileHelper.Read(spec.Rel("test5"))
Expect(err).ToNot(HaveOccurred())
content2, err := fileHelper.Read(spec.Rel("test6"))
Expect(err).ToNot(HaveOccurred())
Expect(content1).To(Equal("artifact5\n"))
Expect(content2).To(Equal("artifact6\n"))
// will contain both
Expect(fileHelper.Exists(spec.Rel("b-test-1.0.package.tar"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("b-test-1.0.metadata.yaml"))).To(BeTrue())
Expect(fileHelper.Exists(spec2.Rel("alpine-seed-1.0.package.tar"))).To(BeTrue())
Expect(fileHelper.Exists(spec2.Rel("alpine-seed-1.0.metadata.yaml"))).To(BeTrue())
repo, err := GenerateRepository(
WithName("test"),
WithDescription("description"),
WithType("disk"),
WithUrls(tmpdir),
WithPriority(1),
WithSource(tmpdir),
FromMetadata(true), // Enabling from metadata makes the package visible
WithTree("../../tests/fixtures/buildable"),
WithDatabase(pkg.NewInMemoryDatabase(false)),
)
Expect(err).ToNot(HaveOccurred())
Expect(repo.GetName()).To(Equal("test"))
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).ToNot(BeTrue())
err = repo.Write(tmpdir, false, true)
Expect(err).ToNot(HaveOccurred())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).To(BeTrue())
// We check now that the artifact not referenced in the tree
// (spec2) is not indexed in the repository
repository, err := NewLuetSystemRepositoryFromYaml([]byte(`
name: "test"
type: "disk"
urls:
- "`+tmpdir+`"
`), pkg.NewInMemoryDatabase(false))
Expect(err).ToNot(HaveOccurred())
repos, err := repository.Sync(true)
Expect(err).ToNot(HaveOccurred())
_, err = repos.GetTree().GetDatabase().FindPackage(spec.GetPackage())
Expect(err).ToNot(HaveOccurred())
_, err = repos.GetTree().GetDatabase().FindPackage(spec2.GetPackage())
Expect(err).ToNot(HaveOccurred()) // should NOT throw error
})
Add repository test file
2019-11-23 14:43:14 +00:00
})
Context("Matching packages", func() {
It("Matches packages in different repositories by priority", func() {
package1 := &pkg.DefaultPackage{Name: "Test"}
package2 := &pkg.DefaultPackage{Name: "Test2"}
builder1 := tree.NewInstallerRecipe(pkg.NewInMemoryDatabase(false))
builder2 := tree.NewInstallerRecipe(pkg.NewInMemoryDatabase(false))
Adapt installer to new changes
2019-11-29 18:01:52 +00:00
_, err := builder1.GetDatabase().CreatePackage(package1)
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Adapt installer to new changes
2019-11-29 18:01:52 +00:00
_, err = builder2.GetDatabase().CreatePackage(package2)
Add repository test file
2019-11-23 14:43:14 +00:00
Expect(err).ToNot(HaveOccurred())
Make repositories arch-aware Introduce an arch field that can be used to filter repositories based on the local architecture. If arch is provided and matching with the current GOARCH then the repository is enabled
2021-10-19 11:05:25 +00:00
repo1 := &LuetSystemRepository{LuetRepository: &types.LuetRepository{Name: "test1"}, Tree: builder1}
repo2 := &LuetSystemRepository{LuetRepository: &types.LuetRepository{Name: "test2"}, Tree: builder2}
Add repository test file
2019-11-23 14:43:14 +00:00
repositories := Repositories{repo1, repo2}
matches := repositories.PackageMatches([]pkg.Package{package1})
Expect(matches).To(Equal([]PackageMatch{{Repo: repo1, Package: package1}}))
})
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
})
Context("Docker repository", func() {
repoImage := os.Getenv("UNIT_TEST_DOCKER_IMAGE_REPOSITORY")
BeforeEach(func() {
if repoImage == "" {
Skip("UNIT_TEST_DOCKER_IMAGE_REPOSITORY not specified")
}
})
It("generates images", func() {
b := backend.NewSimpleDockerBackend()
tmpdir, err := ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe.Load("../../tests/fixtures/buildable")
Expect(err).ToNot(HaveOccurred())
Expect(len(generalRecipe.GetDatabase().GetPackages())).To(Equal(3))
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
localcompiler := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe.GetDatabase())
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
spec, err := localcompiler.FromPackage(&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"})
Expect(err).ToNot(HaveOccurred())
Expect(spec.GetPackage().GetPath()).ToNot(Equal(""))
tmpdir, err = ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
Add repository test file
2019-11-23 14:43:14 +00:00
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
spec.SetOutputPath(tmpdir)
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
a, err := localcompiler.Compile(false, spec)
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(a.Path)).To(BeTrue())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(helpers.Untar(a.Path, tmpdir, false)).ToNot(HaveOccurred())
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel("test5"))).To(BeTrue())
Expect(fileHelper.Exists(spec.Rel("test6"))).To(BeTrue())
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
repo, err := dockerStubRepo(tmpdir, "../../tests/fixtures/buildable", repoImage, true, true)
Expect(err).ToNot(HaveOccurred())
Expect(repo.GetName()).To(Equal("test"))
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).ToNot(BeTrue())
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
err = repo.Write(repoImage, false, true)
Expect(err).ToNot(HaveOccurred())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "tree.tar.gz"))).To(BeTrue())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "repository.meta.yaml.tar"))).To(BeTrue())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "repository.yaml"))).To(BeTrue())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "b-test-1.0"))).To(BeTrue())
extracted, err := ioutil.TempDir("", "extracted")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(extracted) // clean up
c := repo.Client()
f, err := c.DownloadFile("repository.yaml")
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Read(f)).To(ContainSubstring("name: test"))
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
a, err = c.DownloadArtifact(&artifact.PackageArtifact{
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
Path: "test.tar",
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
CompileSpec: &compilerspec.LuetCompilationSpec{
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
Package: &pkg.DefaultPackage{
Name: "b",
Category: "test",
Version: "1.0",
},
},
})
Expect(err).ToNot(HaveOccurred())
Expect(a.Unpack(extracted, false)).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Read(filepath.Join(extracted, "test6"))).To(Equal("artifact6\n"))
Add unit test for creating docker repositories
2021-01-22 18:59:26 +00:00
})
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
It("generates images of virtual packages", func() {
b := backend.NewSimpleDockerBackend()
tmpdir, err := ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
err = generalRecipe.Load("../../tests/fixtures/virtuals")
Expect(err).ToNot(HaveOccurred())
Expect(len(generalRecipe.GetDatabase().GetPackages())).To(Equal(5))
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
localcompiler := compiler.NewLuetCompiler(backend.NewSimpleDockerBackend(), generalRecipe.GetDatabase())
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
spec, err := localcompiler.FromPackage(&pkg.DefaultPackage{Name: "a", Category: "test", Version: "1.99"})
Expect(err).ToNot(HaveOccurred())
Expect(spec.GetPackage().GetPath()).ToNot(Equal(""))
tmpdir, err = ioutil.TempDir("", "tree")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up
spec.SetOutputPath(tmpdir)
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
a, err := localcompiler.Compile(false, spec)
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(a.Path)).To(BeTrue())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(helpers.Untar(a.Path, tmpdir, false)).ToNot(HaveOccurred())
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
repo, err := dockerStubRepo(tmpdir, "../../tests/fixtures/virtuals", repoImage, true, true)
Expect(err).ToNot(HaveOccurred())
Expect(repo.GetName()).To(Equal("test"))
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_SPECFILE))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue())
Expect(fileHelper.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).ToNot(BeTrue())
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
err = repo.Write(repoImage, false, true)
Expect(err).ToNot(HaveOccurred())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "tree.tar.gz"))).To(BeTrue())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "repository.meta.yaml.tar"))).To(BeTrue())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "repository.yaml"))).To(BeTrue())
Expect(b.ImageAvailable(fmt.Sprintf("%s:%s", repoImage, "a-test-1.99"))).To(BeTrue())
extracted, err := ioutil.TempDir("", "extracted")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(extracted) // clean up
c := repo.Client()
f, err := c.DownloadFile("repository.yaml")
Expect(err).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.Read(f)).To(ContainSubstring("name: test"))
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
a, err = c.DownloadArtifact(&artifact.PackageArtifact{
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
Path: "test.tar",
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
CompileSpec: &compilerspec.LuetCompilationSpec{
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
Package: &pkg.DefaultPackage{
Name: "a",
Category: "test",
Version: "1.99",
},
},
})
Expect(err).ToNot(HaveOccurred())
Expect(a.Unpack(extracted, false)).ToNot(HaveOccurred())
Add 2 new events for image unpacking (#226) * Reduce possibility of circular dependency Just by adding an import for bus to anything in the helper dir, we would run into a circular dependency due to how things are structured. That means that we cannot set any events for unpacking or docker helper pulling an image. This commit tries to work around this by doing several things. - Remove full imports of the helper module by segmentating some modules into their own submodule, like docker or match so just using a small match function doesnt bring the whole module - Removing a simple function to check if a dir exists from importing the full helper module and instead write the function (5 lines) - Using logrus in the bus module instead of logger, which avoids a circular dependency Signed-off-by: Itxaka <igarcia@suse.com> * Add two new events for unpacking an image Both pre and post unpacking an image Signed-off-by: Itxaka <igarcia@suse.com>
2021-06-01 14:43:31 +00:00
Expect(fileHelper.DirectoryIsEmpty(extracted)).To(BeFalse())
Handle empty packages when pushing final images We used to create dockerfiles blindly assuming there is content, but that's not the case for virtual packages. Due to https://github.com/moby/moby/issues/38039 we are forced for a "unpleasant" workaround, as we can't create empty FROM scratch images and export them.
2021-02-09 16:27:25 +00:00
content, err := ioutil.ReadFile(filepath.Join(extracted, ".virtual"))
Expect(err).ToNot(HaveOccurred())
Expect(string(content)).To(Equal(""))
})
Add tests for file search
2021-03-06 16:22:01 +00:00
It("Searches files", func() {
repos := Repositories{
&LuetSystemRepository{
Index: compiler.ArtifactIndex{
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
&artifact.PackageArtifact{
CompileSpec: &compilerspec.LuetCompilationSpec{
Add tests for file search
2021-03-06 16:22:01 +00:00
Package: &pkg.DefaultPackage{},
},
Path: "bar",
Files: []string{"boo"},
},
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
&artifact.PackageArtifact{
Add tests for file search
2021-03-06 16:22:01 +00:00
Path: "d",
Files: []string{"baz"},
},
},
},
}
matches := repos.SearchPackages("bo", FileSearch)
Expect(len(matches)).To(Equal(1))
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(matches[0].Artifact.Path).To(Equal("bar"))
Add tests for file search
2021-03-06 16:22:01 +00:00
})
It("Searches packages", func() {
repo := &LuetSystemRepository{
Index: compiler.ArtifactIndex{
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
&artifact.PackageArtifact{
Add tests for file search
2021-03-06 16:22:01 +00:00
Path: "foo",
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
CompileSpec: &compilerspec.LuetCompilationSpec{
Add tests for file search
2021-03-06 16:22:01 +00:00
Package: &pkg.DefaultPackage{
Name: "foo",
Category: "bar",
Version: "1.0",
},
},
},
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
&artifact.PackageArtifact{
Add tests for file search
2021-03-06 16:22:01 +00:00
Path: "baz",
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
CompileSpec: &compilerspec.LuetCompilationSpec{
Add tests for file search
2021-03-06 16:22:01 +00:00
Package: &pkg.DefaultPackage{
Name: "foo",
Category: "baz",
Version: "1.0",
},
},
},
},
}
a, err := repo.SearchArtefact(&pkg.DefaultPackage{
Name: "foo",
Category: "baz",
Version: "1.0",
})
Expect(err).ToNot(HaveOccurred())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(a.Path).To(Equal("baz"))
Add tests for file search
2021-03-06 16:22:01 +00:00
a, err = repo.SearchArtefact(&pkg.DefaultPackage{
Name: "foo",
Category: "bar",
Version: "1.0",
})
Expect(err).ToNot(HaveOccurred())
Refactor compiler and annotate buildoptions into compiler metadata This allows to later pick up values used during build of each package
2021-04-12 17:00:36 +00:00
Expect(a.Path).To(Equal("foo"))
Add tests for file search
2021-03-06 16:22:01 +00:00
// Doesn't exist. so must fail
_, err = repo.SearchArtefact(&pkg.DefaultPackage{
Name: "foo",
Category: "bar",
Version: "1.1",
})
Expect(err).To(HaveOccurred())
})
Add repository test file
2019-11-23 14:43:14 +00:00
})
})
Reference in New Issue Copy Permalink