internal/boot: introduce package for booting images
The package takes the existing code from /cmd/osbuild-image-tests and makes it available for other executables.
This commit is contained in:
parent
7e0711b805
commit
ec6ce8387d
9 changed files with 8 additions and 8 deletions
|
|
@ -23,10 +23,10 @@ import (
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/osbuild/osbuild-composer/cmd/osbuild-image-tests/azuretest"
|
|
||||||
"github.com/osbuild/osbuild-composer/cmd/osbuild-image-tests/constants"
|
"github.com/osbuild/osbuild-composer/cmd/osbuild-image-tests/constants"
|
||||||
"github.com/osbuild/osbuild-composer/cmd/osbuild-image-tests/openstacktest"
|
"github.com/osbuild/osbuild-composer/internal/boot/azuretest"
|
||||||
"github.com/osbuild/osbuild-composer/cmd/osbuild-image-tests/vmwaretest"
|
"github.com/osbuild/osbuild-composer/internal/boot/openstacktest"
|
||||||
|
"github.com/osbuild/osbuild-composer/internal/boot/vmwaretest"
|
||||||
"github.com/osbuild/osbuild-composer/internal/common"
|
"github.com/osbuild/osbuild-composer/internal/common"
|
||||||
"github.com/osbuild/osbuild-composer/internal/upload/vmware"
|
"github.com/osbuild/osbuild-composer/internal/upload/vmware"
|
||||||
)
|
)
|
||||||
|
|
@ -337,7 +337,7 @@ func testBootUsingVMware(t *testing.T, imagePath string) {
|
||||||
creds, err := vmwaretest.AuthOptionsFromEnv()
|
creds, err := vmwaretest.AuthOptionsFromEnv()
|
||||||
|
|
||||||
// if no credentials are given, fall back to qemu
|
// if no credentials are given, fall back to qemu
|
||||||
if (creds == nil) {
|
if creds == nil {
|
||||||
log.Print("No vCenter credentials given, falling back to booting using qemu")
|
log.Print("No vCenter credentials given, falling back to booting using qemu")
|
||||||
log.Printf("Error=%v", err)
|
log.Printf("Error=%v", err)
|
||||||
testBootUsingQemu(t, imagePath)
|
testBootUsingQemu(t, imagePath)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// +build integration
|
// +build integration
|
||||||
|
|
||||||
package main
|
package boot
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// +build integration
|
// +build integration
|
||||||
|
|
||||||
package main
|
package boot
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// +build integration
|
// +build integration
|
||||||
|
|
||||||
package main
|
package boot
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// +build integration
|
// +build integration
|
||||||
|
|
||||||
package main
|
package boot
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue