tests: fix tests due to restructuring images repo COMPOSER-2185

Just a followup of https://issues.redhat.com/browse/COMPOSER-2185 and it's PR osbuild/images#529 also updating images and osbuild-composer repos
osbuild · Apr 8, 2024 · 2a3aafe · 2a3aafe
1 parent 2c60c9a
commit 2a3aafe
Show file tree

Hide file tree

Showing 46 changed files with 3,717 additions and 2,069 deletions.
diff --git a/cmd/osbuild-dnf-json-tests/main_test.go b/cmd/osbuild-dnf-json-tests/main_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/osbuild/images/pkg/arch"
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
-	"github.com/osbuild/images/pkg/distro/rhel9"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel9"
 	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/reporegistry"

diff --git a/internal/cloudapi/v2/imagerequest_test.go b/internal/cloudapi/v2/imagerequest_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/osbuild/images/pkg/arch"
-	"github.com/osbuild/images/pkg/distro/rhel9"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel9"
 	"github.com/osbuild/images/pkg/distro/test_distro"
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
 	"github.com/osbuild/osbuild-composer/internal/common"

diff --git a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go
diff --git a/...m/osbuild/images/pkg/distro/rhel9/arch.go → ...om/osbuild/images/pkg/distro/rhel/arch.go b/...m/osbuild/images/pkg/distro/rhel9/arch.go → ...om/osbuild/images/pkg/distro/rhel/arch.go
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/defaults.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/defaults.go
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go