did stuff
Some checks failed
Tests / 🛃 Unit tests (push) Failing after 13s
Tests / 🗄 DB tests (push) Failing after 19s
Tests / 🐍 Lint python scripts (push) Failing after 1s
Tests / ⌨ Golang Lint (push) Failing after 1s
Tests / 📦 Packit config lint (push) Failing after 1s
Tests / 🔍 Check source preparation (push) Failing after 1s
Tests / 🔍 Check for valid snapshot urls (push) Failing after 1s
Tests / 🔍 Check for missing or unused runner repos (push) Failing after 1s
Tests / 🐚 Shellcheck (push) Failing after 1s
Tests / 📦 RPMlint (push) Failing after 1s
Tests / Gitlab CI trigger helper (push) Failing after 1s
Tests / 🎀 kube-linter (push) Failing after 1s
Tests / 🧹 cloud-cleaner-is-enabled (push) Successful in 3s
Tests / 🔍 Check spec file osbuild/images dependencies (push) Failing after 1s

This commit is contained in:
robojerk 2025-08-26 10:34:42 -07:00
parent d228f6d30f
commit 4eeaa43c39
47 changed files with 21390 additions and 31 deletions

View file

@ -1,7 +1,7 @@
Binaries
========
osbuild-composer: The main binary, the service that maintains the queue and schedules all
debian-forge-composer: The main binary, the service that maintains the queue and schedules all
jobs. This is started as the main process by systemd or container runtime.
osbuild-worker: The worker binary that handles jobs from the job queue locally.

View file

@ -11,7 +11,7 @@ import (
)
const (
opensslConfig = "/usr/share/tests/osbuild-composer/x509/openssl.cnf"
opensslConfig = "/usr/share/tests/debian-forge-composer/x509/openssl.cnf"
osbuildCAExt = "osbuild_ca_ext"
osbuildClientExt = "osbuild_client_ext"
)

View file

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
)
const trustedCADir = "/etc/osbuild-composer-test/ca"
const trustedCADir = "/etc/debian-forge-composer-test/ca"
type connectionConfig struct {
CACertFile string
@ -98,7 +98,7 @@ func TestWorkerAPIAuth(t *testing.T) {
func testRoute(t *testing.T, route string, ckp *certificateKeyPair, expectSuccess bool) {
tlsConfig, err := createTLSConfig(&connectionConfig{
CACertFile: "/etc/osbuild-composer/ca-crt.pem",
CACertFile: "/etc/debian-forge-composer/ca-crt.pem",
ClientKeyFile: ckp.key(),
ClientCertFile: ckp.certificate(),
})

View file

@ -18,14 +18,14 @@ import (
)
const (
configFile = "/etc/osbuild-composer/osbuild-composer.toml"
ServerKeyFile = "/etc/osbuild-composer/composer-key.pem"
ServerCertFile = "/etc/osbuild-composer/composer-crt.pem"
configFile = "/etc/debian-forge-composer/debian-forge-composer.toml"
ServerKeyFile = "/etc/debian-forge-composer/composer-key.pem"
ServerCertFile = "/etc/debian-forge-composer/composer-crt.pem"
)
var repositoryConfigs = []string{
"/etc/osbuild-composer/repositories",
"/usr/share/osbuild-composer/repositories",
"/etc/debian-forge-composer/repositories",
"/usr/share/debian-forge-composer/repositories",
}
func main() {
@ -92,7 +92,7 @@ func main() {
}
if config.SplunkHost != "" {
hook, err := slogger.NewSplunkHook(context.Background(), config.SplunkHost, config.SplunkPort, config.SplunkToken, "osbuild-composer")
hook, err := slogger.NewSplunkHook(context.Background(), config.SplunkHost, config.SplunkPort, config.SplunkToken, "debian-forge-composer")
if err != nil {
panic(err)
@ -137,10 +137,10 @@ func main() {
logrus.Fatalf("Could not get listening sockets: %v", err)
}
if l, exists := listeners["osbuild-composer.socket"]; exists {
if len(l) != 2 {
logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain two sockets.")
}
if l, exists := listeners["debian-forge-composer.socket"]; exists {
if len(l) != 2 {
logrus.Fatal("The debian-forge-composer.socket unit is misconfigured. It should contain two sockets.")
}
err = composer.InitWeldr(l[0], config.weldrDistrosImageTypeDenyList())
if err != nil {
@ -154,26 +154,26 @@ func main() {
}
}
if l, exists := listeners["osbuild-local-worker.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The osbuild-local-worker.socket unit is misconfigured. It should contain only one socket.")
}
if l, exists := listeners["debian-forge-local-worker.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The debian-forge-local-worker.socket unit is misconfigured. It should contain only one socket.")
}
composer.InitLocalWorker(l[0])
}
if l, exists := listeners["osbuild-composer-prometheus.socket"]; exists {
if len(l) != 1 {
logrus.Warn("The osbuild-composer-prometheus.socket unit is misconfigured. It should contain only one socket.")
}
if l, exists := listeners["debian-forge-composer-prometheus.socket"]; exists {
if len(l) != 1 {
logrus.Warn("The debian-forge-composer-prometheus.socket unit is misconfigured. It should contain only one socket.")
}
composer.InitMetricsAPI(l[0])
}
if l, exists := listeners["osbuild-composer-api.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The osbuild-composer-api.socket unit is misconfigured. It should contain only one socket.")
}
if l, exists := listeners["debian-forge-composer-api.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The debian-forge-composer-api.socket unit is misconfigured. It should contain only one socket.")
}
err = composer.InitAPI(ServerCertFile, ServerKeyFile, config.Koji.EnableTLS, config.Koji.EnableMTLS, config.Koji.EnableJWT, l[0])
if err != nil {
@ -181,10 +181,10 @@ func main() {
}
}
if l, exists := listeners["osbuild-remote-worker.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The osbuild-remote-worker.socket unit is misconfigured. It should contain only one socket.")
}
if l, exists := listeners["debian-forge-remote-worker.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The debian-forge-remote-worker.socket unit is misconfigured. It should contain only one socket.")
}
err = composer.InitRemoteWorkers(ServerCertFile, ServerKeyFile, config.Worker.EnableTLS, config.Worker.EnableMTLS, config.Worker.EnableJWT, l[0])
if err != nil {