0e4a9e586f
Remove all the internal package that are now in the github.com/osbuild/images package and vendor it. A new function in internal/blueprint/ converts from an osbuild-composer blueprint to an images blueprint. This is necessary for keeping the blueprint implementation in both packages. In the future, the images package will change the blueprint (and most likely rename it) and it will only be part of the osbuild-composer internals and interface. The Convert() function will be responsible for converting the blueprint into the new configuration object.
116 lines
3.6 KiB
Go
116 lines
3.6 KiB
Go
package weldr
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/osbuild/images/pkg/distro"
|
|
"github.com/osbuild/images/pkg/distro/test_distro"
|
|
rpmmd_mock "github.com/osbuild/osbuild-composer/internal/mocks/rpmmd"
|
|
"github.com/osbuild/osbuild-composer/internal/worker"
|
|
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
|
|
)
|
|
|
|
func TestComposeStatusFromLegacyError(t *testing.T) {
|
|
|
|
if len(os.Getenv("OSBUILD_COMPOSER_TEST_EXTERNAL")) > 0 {
|
|
t.Skip("This test is for internal testing only")
|
|
}
|
|
|
|
api, _ := createWeldrAPI(t.TempDir(), rpmmd_mock.BaseFixture)
|
|
|
|
distroStruct := test_distro.New()
|
|
arch, err := distroStruct.GetArch(test_distro.TestArchName)
|
|
if err != nil {
|
|
t.Fatalf("error getting arch from distro: %v", err)
|
|
}
|
|
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
|
|
if err != nil {
|
|
t.Fatalf("error getting image type from arch: %v", err)
|
|
}
|
|
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, 0)
|
|
if err != nil {
|
|
t.Fatalf("error creating osbuild manifest: %v", err)
|
|
}
|
|
mf, err := manifest.Serialize(nil, nil, nil)
|
|
if err != nil {
|
|
t.Fatalf("error serializing osbuild manifest: %v", err)
|
|
}
|
|
|
|
jobId, err := api.workers.EnqueueOSBuild(arch.Name(), &worker.OSBuildJob{Manifest: mf}, "")
|
|
require.NoError(t, err)
|
|
|
|
j, token, _, _, _, err := api.workers.RequestJob(context.Background(), arch.Name(), []string{worker.JobTypeOSBuild}, []string{""})
|
|
require.NoError(t, err)
|
|
require.Equal(t, jobId, j)
|
|
|
|
jobResult := worker.OSBuildJobResult{
|
|
JobResult: worker.JobResult{
|
|
JobError: &clienterrors.Error{
|
|
ID: clienterrors.ErrorUploadingImage,
|
|
Reason: "Upload error",
|
|
},
|
|
},
|
|
}
|
|
rawResult, err := json.Marshal(jobResult)
|
|
require.NoError(t, err)
|
|
err = api.workers.FinishJob(token, rawResult)
|
|
require.NoError(t, err)
|
|
|
|
jobInfo, err := api.workers.OSBuildJobInfo(jobId, &jobResult)
|
|
require.NoError(t, err)
|
|
|
|
state := composeStateFromJobStatus(jobInfo.JobStatus, &jobResult)
|
|
require.Equal(t, "FAILED", state.ToString())
|
|
}
|
|
|
|
func TestComposeStatusFromJobError(t *testing.T) {
|
|
|
|
if len(os.Getenv("OSBUILD_COMPOSER_TEST_EXTERNAL")) > 0 {
|
|
t.Skip("This test is for internal testing only")
|
|
}
|
|
|
|
api, _ := createWeldrAPI(t.TempDir(), rpmmd_mock.BaseFixture)
|
|
|
|
distroStruct := test_distro.New()
|
|
arch, err := distroStruct.GetArch(test_distro.TestArchName)
|
|
if err != nil {
|
|
t.Fatalf("error getting arch from distro: %v", err)
|
|
}
|
|
imageType, err := arch.GetImageType(test_distro.TestImageTypeName)
|
|
if err != nil {
|
|
t.Fatalf("error getting image type from arch: %v", err)
|
|
}
|
|
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, 0)
|
|
if err != nil {
|
|
t.Fatalf("error creating osbuild manifest: %v", err)
|
|
}
|
|
mf, err := manifest.Serialize(nil, nil, nil)
|
|
if err != nil {
|
|
t.Fatalf("error serializing osbuild manifest: %v", err)
|
|
}
|
|
|
|
jobId, err := api.workers.EnqueueOSBuild(arch.Name(), &worker.OSBuildJob{Manifest: mf}, "")
|
|
require.NoError(t, err)
|
|
|
|
j, token, _, _, _, err := api.workers.RequestJob(context.Background(), arch.Name(), []string{worker.JobTypeOSBuild}, []string{""})
|
|
require.NoError(t, err)
|
|
require.Equal(t, jobId, j)
|
|
|
|
jobResult := worker.OSBuildJobResult{}
|
|
jobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorUploadingImage, "Upload error", nil)
|
|
rawResult, err := json.Marshal(jobResult)
|
|
require.NoError(t, err)
|
|
err = api.workers.FinishJob(token, rawResult)
|
|
require.NoError(t, err)
|
|
|
|
jobInfo, err := api.workers.OSBuildJobInfo(jobId, &jobResult)
|
|
require.NoError(t, err)
|
|
|
|
state := composeStateFromJobStatus(jobInfo.JobStatus, &jobResult)
|
|
require.Equal(t, "FAILED", state.ToString())
|
|
}
|