Port osbuild/images v0.33.0 with dot-notation to composer

Update the osbuild/images to the version which introduces "dot notation"
for distro release versions.

 - Replace all uses of distroregistry by distrofactory.
 - Delete local version of reporegistry and use the one from the
   osbuild/images.
 - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single
   `createTestWeldrAPI()` function`.
 - store/fixture: rework fixtures to allow overriding the host distro
   name and host architecture name. A cleanup function to restore the
   host distro and arch names is always part of the fixture struct.
 - Delete `distro_mock` package, since it is no longer used.
 - Bump the required version of osbuild to 98, because the OSCAP
   customization is using the 'compress_results' stage option, which is
   not available in older versions of osbuild.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-01-08 17:58:49 +01:00 committed by Achilleas Koutsou
parent f6ff8c40dd
commit 625b1578fa
1166 changed files with 154457 additions and 5508 deletions

View file

@ -3,6 +3,7 @@ package v2
import (
"testing"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/distro/rhel9"
"github.com/osbuild/images/pkg/distro/test_distro"
"github.com/osbuild/osbuild-composer/internal/blueprint"
@ -14,7 +15,8 @@ import (
)
func TestImageRequestSize(t *testing.T) {
distro := test_distro.New()
distro := test_distro.DistroFactory(test_distro.TestDistro1Name)
require.NotNil(t, distro)
arch, err := distro.GetArch(test_distro.TestArchName)
if err != nil {
panic(err)
@ -135,8 +137,9 @@ func TestGetOstreeOptions(t *testing.T) {
func TestGetTargets(t *testing.T) {
at := assert.New(t)
r9 := rhel9.NewRHEL93()
arch, err := r9.GetArch("x86_64")
r9 := rhel9.DistroFactory("rhel-9.3")
require.NotNil(t, r9)
arch, err := r9.GetArch(arch.ARCH_X86_64.String())
at.NoError(err)
cr := &ComposeRequest{