many: take repositories from the "images" library

cmd/osbuild-composer/main.go

@@ -11,6 +11,7 @@ import (
 	"github.com/coreos/go-systemd/journal"
 	"github.com/getsentry/sentry-go"
 	sentrylogrus "github.com/getsentry/sentry-go/logrus"
+	_ "github.com/osbuild/images/data/repositories"
 	"github.com/osbuild/osbuild-composer/internal/common"
 	slogger "github.com/osbuild/osbuild-composer/pkg/splunk_logger"
 	"github.com/sirupsen/logrus"

internal/cloudapi/v2/compose_test.go

@@ -1,8 +1,10 @@
 package v2
 
 import (
+	"io/fs"
 	"testing"
 
+	"github.com/osbuild/images/data/repositories"
 	"github.com/osbuild/images/pkg/customizations/subscription"
 	"github.com/osbuild/images/pkg/disk"
 	"github.com/osbuild/images/pkg/distrofactory"
@@ -811,9 +813,9 @@ func TestGetImageRequests_NoRepositories(t *testing.T) {
 			Repositories:  []Repository{},
 		},
 	}
-	// NOTE: current directory is the location of this file, back up so it can use ./repositories/
-	rr, err := reporegistry.New([]string{"../../../"})
+	reposConf, err := reporegistry.LoadAllRepositoriesFromFS([]fs.FS{repos.FS})
 	require.NoError(t, err)
+	rr := reporegistry.NewFromDistrosRepoConfigs(reposConf)
 	got, err := request.GetImageRequests(distrofactory.NewDefault(), rr)
 	assert.NoError(t, err)
 	require.Len(t, got, 1)
@@ -837,9 +839,9 @@ func TestGetImageRequests_BlueprintDistro(t *testing.T) {
 			Distro: common.ToPtr("fedora-39"),
 		},
 	}
-	// NOTE: current directory is the location of this file, back up so it can use ./repositories/
-	rr, err := reporegistry.New([]string{"../../../"})
+	reposConf, err := reporegistry.LoadAllRepositoriesFromFS([]fs.FS{repos.FS})
 	require.NoError(t, err)
+	rr := reporegistry.NewFromDistrosRepoConfigs(reposConf)
 	got, err := request.GetImageRequests(distrofactory.NewDefault(), rr)
 	assert.NoError(t, err)
 	require.Len(t, got, 1)

osbuild-composer.spec

@@ -159,20 +159,21 @@ install -m 0755 -vd                                                %{buildroot}%
 
 # Latest CentOS supports building all CentOS versions
 %if 0%{?centos} >= 10
-install -m 0644 -vp repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
 
 %else
 # All other CentOS versions support building for the same version
-install -m 0644 -vp repositories/centos-%{centos}*                 %{buildroot}%{_datadir}/osbuild-composer/repositories/
-install -m 0644 -vp repositories/centos-stream-%{centos}*          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{centos}*                 %{buildroot}%{_datadir}/osbuild-composer/repositories/
+# centos-stream-* are symlinks
+cp -a repositories/centos-stream-%{centos}*          %{buildroot}%{_datadir}/osbuild-composer/repositories/
 %endif
 
 %else
 
 %if 0%{?rhel}
 # RHEL 10 supports building all RHEL versions
 %if 0%{?rhel} >= 10
-for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do
+for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-* | grep -v 'no-aux-key'); do
     install -m 0644 -vp ${REPO_FILE}                               %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
 done
 
@@ -183,13 +184,13 @@ done
 
 %else
 # All other RHEL versions support building for the same version
-for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do
+for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do
     install -m 0644 -vp ${REPO_FILE}                               %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
 done
 
 # RHEL 9 supports building also for RHEL 8
 %if 0%{?rhel} == 9
-for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do
+for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-8* | grep -v 'no-aux-key'); do
     install -m 0644 -vp ${REPO_FILE}                               %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
 done
 %endif
@@ -200,7 +201,7 @@ done
 
 # Fedora can build for all included fedora releases
 %if 0%{?fedora}
-install -m 0644 -vp repositories/fedora-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/fedora-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
 %endif
 
 install -m 0755 -vd                                                %{buildroot}%{_unitdir}

repositories/README.md

@@ -0,0 +1,12 @@
+All repository data is imported via the "images" library, see
+https://github.com/osbuild/images/tree/main/data/repositories
+
+Most are imported via the "vendor" mechanism, but some special
+repositories are kept here, like the `*-no-aux-key.json` that is for
+rhel8 only and will only get installed on rhel10 (because the crypto
+policy on rhel10 does not allow the sha1 aux-key in the original
+rhel8 keys.
+
+It also contains the centos-* -> centos-stream-* symlinks as
+`go:embed` does not support symlinks so we need to keep them
+externally.

repositories/centos-stream-10.json

@@ -0,0 +1 @@
+centos-10.json