diff --git a/docs/kola/adding-tests.md b/docs/kola/adding-tests.md index 3cefdae088605a60486786619e255851d3ee8bb2..4853f4f7a9b3c4464cf73ae8b06cd79c14022134 100644 --- a/docs/kola/adding-tests.md +++ b/docs/kola/adding-tests.md @@ -110,18 +110,18 @@ As an example, let's say you want to add a new test package called `foo`. 1. First create `mantle/kola/tests/foo/` 2. Then `echo "package foo" > mantle/kola/tests/foo/foo.go` -3. Next, edit `mantle/kola/registry/registry.go` and add this to the imports `_ "github.com/coreos/mantle/kola/tests/foo"` +3. Next, edit `mantle/kola/registry/registry.go` and add this to the imports `_ "github.com/coreos/coreos-assembler/mantle/kola/tests/foo"` ```golang package registry // Tests imported for registration side effects. These make up the OS test suite and is explicitly imported from the main package. import ( - _ "github.com/coreos/mantle/kola/tests/coretest" - _ "github.com/coreos/mantle/kola/tests/crio" - _ "github.com/coreos/mantle/kola/tests/docker" - _ "github.com/coreos/mantle/kola/tests/etcd" - _ "github.com/coreos/mantle/kola/tests/foo" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/coretest" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/crio" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/docker" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/etcd" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/foo" ``` @@ -148,17 +148,17 @@ import ( package foo import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) // init runs when the package is imported and takes care of registering tests func init() { - register.RegisterTest(®ister.Test{ // See: https://godoc.org/github.com/coreos/mantle/kola/register#Test + register.RegisterTest(®ister.Test{ // See: https://godoc.org/github.com/coreos/coreos-assembler/mantle/kola/register#Test Run: exampleTestGroup, ClusterSize: 1, Name: `example.example`, - Flags: []register.Flag{}, // See: https://godoc.org/github.com/coreos/mantle/kola/register#Flag + Flags: []register.Flag{}, // See: https://godoc.org/github.com/coreos/coreos-assembler/mantle/kola/register#Flag Distros: []string{"rhcos"}, FailFast: true, }) @@ -193,22 +193,22 @@ package registry // Tests imported for registration side effects. These make up the OS test suite and is explicitly imported from the main package. import ( - _ "github.com/coreos/mantle/kola/tests/coretest" - _ "github.com/coreos/mantle/kola/tests/crio" - _ "github.com/coreos/mantle/kola/tests/docker" - _ "github.com/coreos/mantle/kola/tests/etcd" - _ "github.com/coreos/mantle/kola/tests/flannel" - _ "github.com/coreos/mantle/kola/tests/foo" - _ "github.com/coreos/mantle/kola/tests/ignition" - _ "github.com/coreos/mantle/kola/tests/kubernetes" - _ "github.com/coreos/mantle/kola/tests/locksmith" - _ "github.com/coreos/mantle/kola/tests/metadata" - _ "github.com/coreos/mantle/kola/tests/misc" - _ "github.com/coreos/mantle/kola/tests/ostree" - _ "github.com/coreos/mantle/kola/tests/packages" - _ "github.com/coreos/mantle/kola/tests/podman" - _ "github.com/coreos/mantle/kola/tests/rkt" - _ "github.com/coreos/mantle/kola/tests/rpmostree" - _ "github.com/coreos/mantle/kola/tests/update" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/coretest" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/crio" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/docker" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/etcd" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/flannel" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/foo" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/ignition" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/kubernetes" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/locksmith" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/metadata" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/misc" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/ostree" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/packages" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/podman" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/rkt" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/rpmostree" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/update" ) ``` diff --git a/mantle/auth/azure.go b/mantle/auth/azure.go index 1da3e3a1c069acf7f32413ccbad0e908b12a1953..c08b72e30a967d28c4f64d743e64261c397aec95 100644 --- a/mantle/auth/azure.go +++ b/mantle/auth/azure.go @@ -25,7 +25,7 @@ import ( "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) const ( diff --git a/mantle/cli/cli.go b/mantle/cli/cli.go index b45f11e531587893941b3aa586b63150b5df1a56..85ce5fe80b6847e579103d51cde4d9154e9e58ed 100644 --- a/mantle/cli/cli.go +++ b/mantle/cli/cli.go @@ -20,8 +20,8 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/system/exec" - "github.com/coreos/mantle/version" + "github.com/coreos/coreos-assembler/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/version" ) var ( @@ -38,7 +38,7 @@ var ( logVerbose bool logLevel = capnslog.NOTICE - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "cli") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "cli") ) // Execute sets up common features that all mantle commands should share diff --git a/mantle/cmd/kola/bootchart.go b/mantle/cmd/kola/bootchart.go index 29ecd742d0bb97287e880eccd93ade8ba467000e..eb8a122248a8a94a8fefeadee7b2f81becd4cb8c 100644 --- a/mantle/cmd/kola/bootchart.go +++ b/mantle/cmd/kola/bootchart.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/platform" ) var cmdBootchart = &cobra.Command{ diff --git a/mantle/cmd/kola/console.go b/mantle/cmd/kola/console.go index 9073dd944a9af8f4706563048c104243bbf05ef5..b3fff738e4e5e56851fdb4dcde700a5c53b997dc 100644 --- a/mantle/cmd/kola/console.go +++ b/mantle/cmd/kola/console.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola" ) var ( diff --git a/mantle/cmd/kola/devshell.go b/mantle/cmd/kola/devshell.go index 29309117388b66276e7af47b243cd834b86f6323..5b7d453271742c9f14802177ef0276eb065e37b5 100644 --- a/mantle/cmd/kola/devshell.go +++ b/mantle/cmd/kola/devshell.go @@ -30,10 +30,10 @@ import ( "syscall" "time" - "github.com/coreos/mantle/network" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/network" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" "github.com/pkg/errors" "golang.org/x/term" ) diff --git a/mantle/cmd/kola/kola.go b/mantle/cmd/kola/kola.go index e0dc1359428db309ff13cc141c9fa51220c9e5a5..ace7d0ef170f7c4241115a4fb936e4cfb9793f04 100644 --- a/mantle/cmd/kola/kola.go +++ b/mantle/cmd/kola/kola.go @@ -30,23 +30,23 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/fcos" + "github.com/coreos/coreos-assembler/mantle/harness/reporters" + "github.com/coreos/coreos-assembler/mantle/harness/testresult" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/system" + "github.com/coreos/coreos-assembler/mantle/util" cosa "github.com/coreos/coreos-assembler/pkg/builds" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/fcos" - "github.com/coreos/mantle/harness/reporters" - "github.com/coreos/mantle/harness/testresult" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/system" - "github.com/coreos/mantle/util" coreosarch "github.com/coreos/stream-metadata-go/arch" // register OS test suite - _ "github.com/coreos/mantle/kola/registry" + _ "github.com/coreos/coreos-assembler/mantle/kola/registry" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kola") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola") root = &cobra.Command{ Use: "kola [command]", @@ -171,7 +171,7 @@ func preRun(cmd *cobra.Command, args []string) error { // Packet uses storage, and storage talks too much. if !plog.LevelAt(capnslog.INFO) { - mantleLogger := capnslog.MustRepoLogger("github.com/coreos/mantle") + mantleLogger := capnslog.MustRepoLogger("github.com/coreos/coreos-assembler/mantle") mantleLogger.SetLogLevel(map[string]capnslog.LogLevel{ "storage": capnslog.WARNING, }) diff --git a/mantle/cmd/kola/options.go b/mantle/cmd/kola/options.go index 4434c7789e7e3ce25dcfe9916682079d45397c62..56e38558a0c3347c832b6ea08225e8a1c0603818 100644 --- a/mantle/cmd/kola/options.go +++ b/mantle/cmd/kola/options.go @@ -25,13 +25,13 @@ import ( "github.com/coreos/stream-metadata-go/stream" "github.com/pkg/errors" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/fcos" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/rhcos" - "github.com/coreos/mantle/system" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/fcos" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/rhcos" + "github.com/coreos/coreos-assembler/mantle/system" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( diff --git a/mantle/cmd/kola/qemuexec.go b/mantle/cmd/kola/qemuexec.go index 950dd3e1a7fc619a45e56d36705d267d50af9cd4..433068822d5b4c1eab8438094400825a3f282778 100644 --- a/mantle/cmd/kola/qemuexec.go +++ b/mantle/cmd/kola/qemuexec.go @@ -27,9 +27,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) var ( diff --git a/mantle/cmd/kola/spawn.go b/mantle/cmd/kola/spawn.go index 26043f5e04ca71befdd57e787df5612f8699eeb7..97e504f7fbb0452a4d8fa070f27db638c58c9f57 100644 --- a/mantle/cmd/kola/spawn.go +++ b/mantle/cmd/kola/spawn.go @@ -29,10 +29,10 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/unprivqemu" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu" ) var ( diff --git a/mantle/cmd/kola/switchkernel.go b/mantle/cmd/kola/switchkernel.go index 0fb5b7d5fe7a58f5c69b6ad9a0fbaa51c15f3ff5..30f0430ddcfb420a3097bffe7be3ec4b9872be74 100644 --- a/mantle/cmd/kola/switchkernel.go +++ b/mantle/cmd/kola/switchkernel.go @@ -21,9 +21,9 @@ import ( "regexp" "strings" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/mantle/cmd/kola/testiso.go b/mantle/cmd/kola/testiso.go index b6a569e36fb82f1b753b34fc66af5dac4fb700e7..47d05104c05f0bddc544704df859c42179d7cbcd 100644 --- a/mantle/cmd/kola/testiso.go +++ b/mantle/cmd/kola/testiso.go @@ -29,15 +29,15 @@ import ( "strings" "time" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" coreosarch "github.com/coreos/stream-metadata-go/arch" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/platform" ) var ( diff --git a/mantle/cmd/kolet/kolet.go b/mantle/cmd/kolet/kolet.go index 3d84166b800202ee8d8fb0219985ee4418191f58..3d3e737fab5eaca64549352d79e9d4b509735751 100644 --- a/mantle/cmd/kolet/kolet.go +++ b/mantle/cmd/kolet/kolet.go @@ -31,12 +31,12 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/register" // Register any tests that we may wish to execute in kolet. - _ "github.com/coreos/mantle/kola/registry" + _ "github.com/coreos/coreos-assembler/mantle/kola/registry" ) const ( @@ -112,7 +112,7 @@ exec ~nest/kolet reboot-request "$1" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kolet") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kolet") root = &cobra.Command{ Use: "kolet run [test] [func]", diff --git a/mantle/cmd/ore/aliyun.go b/mantle/cmd/ore/aliyun.go index 18c9149425a860441b266109ed39e6dc87ee6c31..313085f7ec756966774e347a9e68194beed3679b 100644 --- a/mantle/cmd/ore/aliyun.go +++ b/mantle/cmd/ore/aliyun.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/aliyun" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/aliyun" ) func init() { diff --git a/mantle/cmd/ore/aliyun/aliyun.go b/mantle/cmd/ore/aliyun/aliyun.go index 5364222cca6b1ac0649c45152afb528d12bba6f3..05fe51ef3d5f6928c903f4dc568e1bf7d46e395a 100644 --- a/mantle/cmd/ore/aliyun/aliyun.go +++ b/mantle/cmd/ore/aliyun/aliyun.go @@ -21,12 +21,12 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform/api/aliyun" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform/api/aliyun" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/aliyun") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/aliyun") Aliyun = &cobra.Command{ Use: "aliyun [command]", diff --git a/mantle/cmd/ore/aliyun/create-image.go b/mantle/cmd/ore/aliyun/create-image.go index 9836a0af2ac18bc5918eb845179bed6782eaa8f6..a1de47833394f49fbe0dd45174fdbf6be3b86cf6 100644 --- a/mantle/cmd/ore/aliyun/create-image.go +++ b/mantle/cmd/ore/aliyun/create-image.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( diff --git a/mantle/cmd/ore/aws.go b/mantle/cmd/ore/aws.go index 8f57547034bb0d39b857636d951ac048dd8a32bb..04409ae6d7ddfdcdd77d5d5e4511bd5ba03bc3a2 100644 --- a/mantle/cmd/ore/aws.go +++ b/mantle/cmd/ore/aws.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/aws" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/aws" ) func init() { diff --git a/mantle/cmd/ore/aws/aws.go b/mantle/cmd/ore/aws/aws.go index a56146c0d4af7180d0d8408d328e33b4e4926b77..fa600b63a71665fa4880058c1f87439d21004c6c 100644 --- a/mantle/cmd/ore/aws/aws.go +++ b/mantle/cmd/ore/aws/aws.go @@ -18,15 +18,15 @@ import ( "fmt" "os" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/aws" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/aws" "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/aws") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/aws") AWS = &cobra.Command{ Use: "aws [command]", diff --git a/mantle/cmd/ore/aws/copy-image.go b/mantle/cmd/ore/aws/copy-image.go index 0eca20092c6b8b005dffae2e14cf292a575f4725..627a990c21f151ab49d9d3b0f9b1fce20972cea3 100644 --- a/mantle/cmd/ore/aws/copy-image.go +++ b/mantle/cmd/ore/aws/copy-image.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/mantle/platform/api/aws" + "github.com/coreos/coreos-assembler/mantle/platform/api/aws" "github.com/spf13/cobra" ) diff --git a/mantle/cmd/ore/aws/list-regions.go b/mantle/cmd/ore/aws/list-regions.go index cb40f0a1ef44f05005867cbaca627181ff90ab15..3ae7e27f73ee2ce4a720b6cdc04e222013bb4e33 100644 --- a/mantle/cmd/ore/aws/list-regions.go +++ b/mantle/cmd/ore/aws/list-regions.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/platform/api/aws" + "github.com/coreos/coreos-assembler/mantle/platform/api/aws" ) var ( diff --git a/mantle/cmd/ore/aws/upload.go b/mantle/cmd/ore/aws/upload.go index 5497bf080d73ebb430e8b347b8170fd88d15de4e..880180926d6ec3414a442ef95ee2050b110ed8c2 100644 --- a/mantle/cmd/ore/aws/upload.go +++ b/mantle/cmd/ore/aws/upload.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" - "github.com/coreos/mantle/platform/api/aws" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform/api/aws" + "github.com/coreos/coreos-assembler/mantle/util" "github.com/spf13/cobra" ) diff --git a/mantle/cmd/ore/azure.go b/mantle/cmd/ore/azure.go index e159fceacfc507a98ffb5459a2ca7fc88b159686..5e065aee9edaddca0f3ae4a5a94e67e5dda8e129 100644 --- a/mantle/cmd/ore/azure.go +++ b/mantle/cmd/ore/azure.go @@ -18,7 +18,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/azure" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/azure" ) func init() { diff --git a/mantle/cmd/ore/azure/azure.go b/mantle/cmd/ore/azure/azure.go index 7d89a37ef101a7afad0ea7f7cce80a56be89afb9..2013a5f62d853a374cd110fa82790d25c1e7e7a3 100644 --- a/mantle/cmd/ore/azure/azure.go +++ b/mantle/cmd/ore/azure/azure.go @@ -18,13 +18,13 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform/api/azure" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform/api/azure" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/azure") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/azure") Azure = &cobra.Command{ Use: "azure [command]", diff --git a/mantle/cmd/ore/do.go b/mantle/cmd/ore/do.go index b6c550d344270480b6181366e8a4f8fc6c5ec5a0..f8a616fd77f2d4b1532060ff88dd52b8dc44aef2 100644 --- a/mantle/cmd/ore/do.go +++ b/mantle/cmd/ore/do.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/do" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/do" ) func init() { diff --git a/mantle/cmd/ore/do/create-image.go b/mantle/cmd/ore/do/create-image.go index 35ad0b851eda459a0e5484f8114452ca239b84a6..33a093e5b4faa9827a80257ebc151aad3c4689fe 100644 --- a/mantle/cmd/ore/do/create-image.go +++ b/mantle/cmd/ore/do/create-image.go @@ -23,9 +23,9 @@ import ( "github.com/pborman/uuid" "github.com/spf13/cobra" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( diff --git a/mantle/cmd/ore/do/do.go b/mantle/cmd/ore/do/do.go index f09625a5c537e26459c40f8f09d7ffc27c280258..464ce0fd3fea58d176a8dd9db45067f2e16f1f58 100644 --- a/mantle/cmd/ore/do/do.go +++ b/mantle/cmd/ore/do/do.go @@ -21,13 +21,13 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform/api/do" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform/api/do" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/do") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/do") DO = &cobra.Command{ Use: "do [command]", diff --git a/mantle/cmd/ore/esx.go b/mantle/cmd/ore/esx.go index 32bd3efcc2e6db855f89f75f398c94b5426ba4da..c402882f6c9a67e31cf8794c032ff94ac6195358 100644 --- a/mantle/cmd/ore/esx.go +++ b/mantle/cmd/ore/esx.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/esx" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/esx" ) func init() { diff --git a/mantle/cmd/ore/esx/esx.go b/mantle/cmd/ore/esx/esx.go index 897c069274e209980dd2bc94964cb178a43dee85..d5dcdd13799de355493cca0739ccdc9cfa3971f0 100644 --- a/mantle/cmd/ore/esx/esx.go +++ b/mantle/cmd/ore/esx/esx.go @@ -18,14 +18,14 @@ import ( "fmt" "os" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform/api/esx" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform/api/esx" "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/esx") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/esx") ESX = &cobra.Command{ Use: "esx [command]", diff --git a/mantle/cmd/ore/gcloud.go b/mantle/cmd/ore/gcloud.go index 10a2279f14a3337299c462c5fbdafb03af3a778c..592db20516e4f0d908e296cfe4cd883404d1298c 100644 --- a/mantle/cmd/ore/gcloud.go +++ b/mantle/cmd/ore/gcloud.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/gcloud" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/gcloud" ) func init() { diff --git a/mantle/cmd/ore/gcloud/create-image.go b/mantle/cmd/ore/gcloud/create-image.go index 1adc926b3654adc76b916f0b6e08847587c13548..5b3cc9bac0e777e31d187ab1d564f495a22da33b 100644 --- a/mantle/cmd/ore/gcloud/create-image.go +++ b/mantle/cmd/ore/gcloud/create-image.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" "google.golang.org/api/storage/v1" - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" ) var ( diff --git a/mantle/cmd/ore/gcloud/delete-images.go b/mantle/cmd/ore/gcloud/delete-images.go index b67ea8f1ddcc9cf0f94f72b066e2028328989646..a69ee0a70794383a1ff8205e00981c41e123c0a7 100644 --- a/mantle/cmd/ore/gcloud/delete-images.go +++ b/mantle/cmd/ore/gcloud/delete-images.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" ) var ( diff --git a/mantle/cmd/ore/gcloud/deprecate-image.go b/mantle/cmd/ore/gcloud/deprecate-image.go index e81446fc6b9b216d6b52fa78a34ee2d5f0c449e5..34f6876de7a1bff3e5c8eda4721171db92fdec1d 100644 --- a/mantle/cmd/ore/gcloud/deprecate-image.go +++ b/mantle/cmd/ore/gcloud/deprecate-image.go @@ -17,7 +17,7 @@ package gcloud import ( "fmt" - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" "github.com/spf13/cobra" ) diff --git a/mantle/cmd/ore/gcloud/gcloud.go b/mantle/cmd/ore/gcloud/gcloud.go index d439fb209fa0d65b97a05a886fe564b409cb3700..09428dab728a6a032b8a2b8d6eece3faf0e1343f 100644 --- a/mantle/cmd/ore/gcloud/gcloud.go +++ b/mantle/cmd/ore/gcloud/gcloud.go @@ -18,13 +18,13 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/gce") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/gce") GCloud = &cobra.Command{ Use: "gcloud [command]", diff --git a/mantle/cmd/ore/gcloud/list.go b/mantle/cmd/ore/gcloud/list.go index d1a79107da070392e5fe9b539423f059f3139b7d..44a0fbe532d21ca9fa0aa0ae478a6a901289cad8 100644 --- a/mantle/cmd/ore/gcloud/list.go +++ b/mantle/cmd/ore/gcloud/list.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" ) var ( diff --git a/mantle/cmd/ore/gcloud/promote-image.go b/mantle/cmd/ore/gcloud/promote-image.go index de80221f70648aa5dc36e88d8c20496360ee8ca3..624f6a8494c89e194da358987bdeadf7790fe57d 100644 --- a/mantle/cmd/ore/gcloud/promote-image.go +++ b/mantle/cmd/ore/gcloud/promote-image.go @@ -15,7 +15,7 @@ package gcloud import ( - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" "github.com/spf13/cobra" "golang.org/x/net/context" ) diff --git a/mantle/cmd/ore/gcloud/upload.go b/mantle/cmd/ore/gcloud/upload.go index b0989d45dc640270ab06651635ccf1e5f4b7ed66..f20ad604c11bbdea13688f064e84635dc8a58c55 100644 --- a/mantle/cmd/ore/gcloud/upload.go +++ b/mantle/cmd/ore/gcloud/upload.go @@ -26,7 +26,7 @@ import ( "google.golang.org/api/option" "google.golang.org/api/storage/v1" - "github.com/coreos/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" ) var ( diff --git a/mantle/cmd/ore/ibmcloud.go b/mantle/cmd/ore/ibmcloud.go index d87998c1158ff3bad5555e5f0d9ceffc80ee868a..27dbd85df62dc9ababf595f41777b191252399da 100644 --- a/mantle/cmd/ore/ibmcloud.go +++ b/mantle/cmd/ore/ibmcloud.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/ibmcloud" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/ibmcloud" ) func init() { diff --git a/mantle/cmd/ore/ibmcloud/ibmcloud.go b/mantle/cmd/ore/ibmcloud/ibmcloud.go index b3216a5234a381ff2f6dbdd0a6dd54c409b7e95c..206ba9e283591e26e5bd8a86523428bcdbfdc3b6 100644 --- a/mantle/cmd/ore/ibmcloud/ibmcloud.go +++ b/mantle/cmd/ore/ibmcloud/ibmcloud.go @@ -24,9 +24,9 @@ import ( "os/user" "path/filepath" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/ibmcloud" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/ibmcloud" "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" ) @@ -39,7 +39,7 @@ type apiKeyFile struct { } var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/ibmcloud") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/ibmcloud") IbmCloud = &cobra.Command{ Use: "ibmcloud [command]", diff --git a/mantle/cmd/ore/openstack.go b/mantle/cmd/ore/openstack.go index a7c06b2a1780f77231c9cba686393f47fab28a9f..8f816b6005be838b4f6049540637be5e77935efe 100644 --- a/mantle/cmd/ore/openstack.go +++ b/mantle/cmd/ore/openstack.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/openstack" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/openstack" ) func init() { diff --git a/mantle/cmd/ore/openstack/openstack.go b/mantle/cmd/ore/openstack/openstack.go index d58d12902f42c204cc6530415f9d73b13cea15e5..93ea6af47db54eb0fba54d122f98404a73cb61d6 100644 --- a/mantle/cmd/ore/openstack/openstack.go +++ b/mantle/cmd/ore/openstack/openstack.go @@ -20,12 +20,12 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform/api/openstack" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform/api/openstack" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/openstack") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/openstack") OpenStack = &cobra.Command{ Use: "openstack [command]", diff --git a/mantle/cmd/ore/ore.go b/mantle/cmd/ore/ore.go index d6198e2abf6cfba87916054dce1d25b21ce2ec2d..af7124e68fd3d0d5919e94795ecd6f14234f72a3 100644 --- a/mantle/cmd/ore/ore.go +++ b/mantle/cmd/ore/ore.go @@ -17,7 +17,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/cli" ) var ( diff --git a/mantle/cmd/ore/packet.go b/mantle/cmd/ore/packet.go index fb3e869ee562c3e74dcbf768b6251447912da2a1..92286b4e31d8d38cebd01161d880697eb5fb505b 100644 --- a/mantle/cmd/ore/packet.go +++ b/mantle/cmd/ore/packet.go @@ -15,7 +15,7 @@ package main import ( - "github.com/coreos/mantle/cmd/ore/packet" + "github.com/coreos/coreos-assembler/mantle/cmd/ore/packet" ) func init() { diff --git a/mantle/cmd/ore/packet/create-device.go b/mantle/cmd/ore/packet/create-device.go index 8cb72ce7a08b24d58fc6a8534b2f9abd8d111365..a8f30fbc7eeffc26a16e40baa09257ae5b491398 100644 --- a/mantle/cmd/ore/packet/create-device.go +++ b/mantle/cmd/ore/packet/create-device.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) var ( diff --git a/mantle/cmd/ore/packet/packet.go b/mantle/cmd/ore/packet/packet.go index cb11dd3e3048e8a29e8398936eaaef7c3a83b439..770c176e1bbd5ea299679ccc6d1d00b1ed4e6511 100644 --- a/mantle/cmd/ore/packet/packet.go +++ b/mantle/cmd/ore/packet/packet.go @@ -17,15 +17,15 @@ package packet import ( "fmt" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/cli" - "github.com/coreos/mantle/platform/api/packet" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/platform/api/packet" "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "ore/packet") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "ore/packet") Packet = &cobra.Command{ Use: "packet [command]", diff --git a/mantle/cmd/plume/cosa2stream.go b/mantle/cmd/plume/cosa2stream.go index 51178cca7cf3aa7832bf45b70300258b7adef7fa..ed3b1c7b75c4681c3cc555dd6f1a1855b63a3092 100644 --- a/mantle/cmd/plume/cosa2stream.go +++ b/mantle/cmd/plume/cosa2stream.go @@ -28,7 +28,7 @@ import ( "github.com/coreos/stream-metadata-go/stream" "github.com/spf13/cobra" - "github.com/coreos/mantle/version" + "github.com/coreos/coreos-assembler/mantle/version" ) const ( diff --git a/mantle/cmd/plume/plume.go b/mantle/cmd/plume/plume.go index ef8c95ec832cfaa399abb56d641056807970e13c..2a76fcaa00f28a5f53b27a529df55cc9009645fd 100644 --- a/mantle/cmd/plume/plume.go +++ b/mantle/cmd/plume/plume.go @@ -18,11 +18,11 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/spf13/cobra" - "github.com/coreos/mantle/cli" + "github.com/coreos/coreos-assembler/mantle/cli" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "plume") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "plume") root = &cobra.Command{ Use: "plume [command]", Short: "The CoreOS release utility", diff --git a/mantle/cmd/plume/release.go b/mantle/cmd/plume/release.go index f15116d2d04ca2529fae0cdbddeee9899856aa6c..c642768b42ac821bd57f5b69b87a559450f062a7 100644 --- a/mantle/cmd/plume/release.go +++ b/mantle/cmd/plume/release.go @@ -24,7 +24,7 @@ import ( "time" "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/coreos/mantle/platform/api/aws" + "github.com/coreos/coreos-assembler/mantle/platform/api/aws" "github.com/coreos/stream-metadata-go/release" "github.com/spf13/cobra" ) diff --git a/mantle/harness/_example/main.go b/mantle/harness/_example/main.go index 164d707e34a2ffd1000086e897ba306b98ecde93..74b4660095d8d8ac5bc6a669ec647001e5d4c477 100644 --- a/mantle/harness/_example/main.go +++ b/mantle/harness/_example/main.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/coreos/mantle/harness" + "github.com/coreos/coreos-assembler/mantle/harness" ) type X struct { diff --git a/mantle/harness/harness.go b/mantle/harness/harness.go index 8bc8740e55f8eaa7ae89d75a4cbca794c09ab068..24f798496b77b2d5dcc16d3961874e1640d08ecc 100644 --- a/mantle/harness/harness.go +++ b/mantle/harness/harness.go @@ -29,8 +29,8 @@ import ( "sync" "time" - "github.com/coreos/mantle/harness/reporters" - "github.com/coreos/mantle/harness/testresult" + "github.com/coreos/coreos-assembler/mantle/harness/reporters" + "github.com/coreos/coreos-assembler/mantle/harness/testresult" ) const DefaultTimeoutFlag = 0 diff --git a/mantle/harness/reporters/json.go b/mantle/harness/reporters/json.go index 38feec17d9711a2446aa1f7e6f472722cd64ae34..878c2bdb1b1131e140e3405e3cce2990607920e4 100644 --- a/mantle/harness/reporters/json.go +++ b/mantle/harness/reporters/json.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/coreos/mantle/harness/testresult" + "github.com/coreos/coreos-assembler/mantle/harness/testresult" ) type jsonReporter struct { diff --git a/mantle/harness/reporters/reporter.go b/mantle/harness/reporters/reporter.go index 941b9ead45af62b0e3f52f86b4a8821322b136a8..6247da983ec0bdff08f199bbf45c053752d15ea9 100644 --- a/mantle/harness/reporters/reporter.go +++ b/mantle/harness/reporters/reporter.go @@ -17,7 +17,7 @@ package reporters import ( "time" - "github.com/coreos/mantle/harness/testresult" + "github.com/coreos/coreos-assembler/mantle/harness/testresult" ) type Reporters []Reporter diff --git a/mantle/harness/suite.go b/mantle/harness/suite.go index a5433fc0618b7070f60916656fd0bf584bf76ccc..c418946164110071d3b76c49158a4218e3cedc23 100644 --- a/mantle/harness/suite.go +++ b/mantle/harness/suite.go @@ -31,8 +31,8 @@ import ( "github.com/pkg/errors" - "github.com/coreos/mantle/harness/reporters" - "github.com/coreos/mantle/harness/testresult" + "github.com/coreos/coreos-assembler/mantle/harness/reporters" + "github.com/coreos/coreos-assembler/mantle/harness/testresult" ) const ( diff --git a/mantle/harness/test.go b/mantle/harness/test.go index 07613e8b74adb128dd6cd103a43b896f24bf38db..23e97e726c9c18746decd3d05d4264f4d1692113 100644 --- a/mantle/harness/test.go +++ b/mantle/harness/test.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/coreos/mantle/lang/maps" + "github.com/coreos/coreos-assembler/mantle/lang/maps" ) // Test is a single test function. diff --git a/mantle/kola/cluster/cluster.go b/mantle/kola/cluster/cluster.go index 458106b3455b97d3b901a3aa708836f2ac6c9a41..24f3bce0378014bd8d6b15ded04fce9fbc55aff4 100644 --- a/mantle/kola/cluster/cluster.go +++ b/mantle/kola/cluster/cluster.go @@ -24,14 +24,14 @@ import ( "github.com/kballard/go-shellquote" - "github.com/coreos/mantle/harness" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/harness" + "github.com/coreos/coreos-assembler/mantle/platform" "github.com/coreos/pkg/capnslog" "github.com/pkg/errors" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kola/cluster") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola/cluster") ) // TestCluster embedds a Cluster to provide platform independant helper diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go index 46afa889e0b2c3ae9d357ae76a034bae7cdbf568..6d65d96b367b4d2d6c4f7c2df8900b352fb2dc4c 100644 --- a/mantle/kola/harness.go +++ b/mantle/kola/harness.go @@ -32,31 +32,31 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/coreos/mantle/harness" - "github.com/coreos/mantle/harness/reporters" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/network" - "github.com/coreos/mantle/platform" - awsapi "github.com/coreos/mantle/platform/api/aws" - azureapi "github.com/coreos/mantle/platform/api/azure" - doapi "github.com/coreos/mantle/platform/api/do" - esxapi "github.com/coreos/mantle/platform/api/esx" - gcloudapi "github.com/coreos/mantle/platform/api/gcloud" - openstackapi "github.com/coreos/mantle/platform/api/openstack" - packetapi "github.com/coreos/mantle/platform/api/packet" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/aws" - "github.com/coreos/mantle/platform/machine/azure" - "github.com/coreos/mantle/platform/machine/do" - "github.com/coreos/mantle/platform/machine/esx" - "github.com/coreos/mantle/platform/machine/gcloud" - "github.com/coreos/mantle/platform/machine/openstack" - "github.com/coreos/mantle/platform/machine/packet" - "github.com/coreos/mantle/platform/machine/qemuiso" - "github.com/coreos/mantle/platform/machine/unprivqemu" - "github.com/coreos/mantle/system" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/harness" + "github.com/coreos/coreos-assembler/mantle/harness/reporters" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/network" + "github.com/coreos/coreos-assembler/mantle/platform" + awsapi "github.com/coreos/coreos-assembler/mantle/platform/api/aws" + azureapi "github.com/coreos/coreos-assembler/mantle/platform/api/azure" + doapi "github.com/coreos/coreos-assembler/mantle/platform/api/do" + esxapi "github.com/coreos/coreos-assembler/mantle/platform/api/esx" + gcloudapi "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" + openstackapi "github.com/coreos/coreos-assembler/mantle/platform/api/openstack" + packetapi "github.com/coreos/coreos-assembler/mantle/platform/api/packet" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/aws" + "github.com/coreos/coreos-assembler/mantle/platform/machine/azure" + "github.com/coreos/coreos-assembler/mantle/platform/machine/do" + "github.com/coreos/coreos-assembler/mantle/platform/machine/esx" + "github.com/coreos/coreos-assembler/mantle/platform/machine/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/machine/openstack" + "github.com/coreos/coreos-assembler/mantle/platform/machine/packet" + "github.com/coreos/coreos-assembler/mantle/platform/machine/qemuiso" + "github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu" + "github.com/coreos/coreos-assembler/mantle/system" + "github.com/coreos/coreos-assembler/mantle/util" coreosarch "github.com/coreos/stream-metadata-go/arch" ) @@ -94,7 +94,7 @@ const SkipBaseChecksTag = "skip-base-checks" const snoozeFormat = "2006-01-02" var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kola") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola") Options = platform.Options{} AWSOptions = awsapi.Options{Options: &Options} // glue to set platform options from main diff --git a/mantle/kola/register/register.go b/mantle/kola/register/register.go index cd21f0a0cbdf2b4f2a2ebb2c3af2c7863455f032..63cb4f57e602dd3ce3c35a1d188b2ae1496cdafe 100644 --- a/mantle/kola/register/register.go +++ b/mantle/kola/register/register.go @@ -18,8 +18,8 @@ import ( "fmt" "time" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type Flag int diff --git a/mantle/kola/registry/registry.go b/mantle/kola/registry/registry.go index c1742e41300bf1c4491c3676d1f86705c765033a..30b1e28f2954254f2868f52bd0dfd337e8aa2230 100644 --- a/mantle/kola/registry/registry.go +++ b/mantle/kola/registry/registry.go @@ -2,17 +2,17 @@ package registry // Tests imported for registration side effects. These make up the OS test suite and is explicitly imported from the main package. import ( - _ "github.com/coreos/mantle/kola/tests/coretest" - _ "github.com/coreos/mantle/kola/tests/crio" - _ "github.com/coreos/mantle/kola/tests/etcd" - _ "github.com/coreos/mantle/kola/tests/fips" - _ "github.com/coreos/mantle/kola/tests/ignition" - _ "github.com/coreos/mantle/kola/tests/metadata" - _ "github.com/coreos/mantle/kola/tests/misc" - _ "github.com/coreos/mantle/kola/tests/ostree" - _ "github.com/coreos/mantle/kola/tests/podman" - _ "github.com/coreos/mantle/kola/tests/isula" - _ "github.com/coreos/mantle/kola/tests/rhcos" - _ "github.com/coreos/mantle/kola/tests/rpmostree" - _ "github.com/coreos/mantle/kola/tests/upgrade" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/coretest" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/crio" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/etcd" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/fips" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/ignition" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/metadata" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/misc" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/ostree" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/podman" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/isula" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/rhcos" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/rpmostree" + _ "github.com/coreos/coreos-assembler/mantle/kola/tests/upgrade" ) diff --git a/mantle/kola/tests/coretest/core.go b/mantle/kola/tests/coretest/core.go index cad16aab21cc20450ebbf75a16482ddf0fa7e9a2..86fa43e365cdfd9c3ba2f7a718ece925533e9132 100644 --- a/mantle/kola/tests/coretest/core.go +++ b/mantle/kola/tests/coretest/core.go @@ -11,8 +11,8 @@ import ( "github.com/pborman/uuid" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/util" ) const ( diff --git a/mantle/kola/tests/coretest/testgroupglue.go b/mantle/kola/tests/coretest/testgroupglue.go index 7117890efc5b31d65308f7c577958305a73a31bd..e5bb9deb9f94311a5e255de09ef3b5eb89509446 100644 --- a/mantle/kola/tests/coretest/testgroupglue.go +++ b/mantle/kola/tests/coretest/testgroupglue.go @@ -1,7 +1,7 @@ package coretest import ( - "github.com/coreos/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" ) // run various native functions that only require a single machine diff --git a/mantle/kola/tests/crio/crio.go b/mantle/kola/tests/crio/crio.go index f77dcc52a5c0d21753d9a059bd2f593052f067dc..a9500d3bd4912c0eb0c83c87fb8a80b46d2fbac5 100644 --- a/mantle/kola/tests/crio/crio.go +++ b/mantle/kola/tests/crio/crio.go @@ -25,12 +25,12 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/net/context" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/lang/worker" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/lang/worker" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) // simplifiedCrioInfo represents the results from crio info diff --git a/mantle/kola/tests/docker/docker.go b/mantle/kola/tests/docker/docker.go index e158726372ca8ae4c0262795dc7cb1854ad201ac..7b639279d8afde155309feb46dbd15288c13dbca 100644 --- a/mantle/kola/tests/docker/docker.go +++ b/mantle/kola/tests/docker/docker.go @@ -27,12 +27,12 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/net/context" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/lang/worker" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/lang/worker" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) type simplifiedDockerInfo struct { diff --git a/mantle/kola/tests/etcd/rhcos.go b/mantle/kola/tests/etcd/rhcos.go index e6847da9853b44343a3325547e56346b85151b32..a120d4ba2ad795b5a6146047dc6e1c72e87526bb 100644 --- a/mantle/kola/tests/etcd/rhcos.go +++ b/mantle/kola/tests/etcd/rhcos.go @@ -22,13 +22,13 @@ import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kola/tests/etcd") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola/tests/etcd") func init() { register.RegisterTest(®ister.Test{ diff --git a/mantle/kola/tests/etcd/util.go b/mantle/kola/tests/etcd/util.go index 5251af702e3af6b18ef8db3530c4e2600e49da18..31f79c3e29c118f5f431e494b79d90361ba347c7 100644 --- a/mantle/kola/tests/etcd/util.go +++ b/mantle/kola/tests/etcd/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" ) // GetClusterHealth polls etcdctl cluster-health command until success diff --git a/mantle/kola/tests/fips/fips.go b/mantle/kola/tests/fips/fips.go index 640c45328237ea47c9402e58427fb6683fa465e6..b0eb7b83d81eba7fbc86efa083ca6382b599b9c2 100644 --- a/mantle/kola/tests/fips/fips.go +++ b/mantle/kola/tests/fips/fips.go @@ -1,9 +1,9 @@ package fips import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/empty.go b/mantle/kola/tests/ignition/empty.go index 649f09fe79d6408615f83ce7e54169ca18768631..175c76d1fb13e32aaf2d89fdfd75065a84d6c9f0 100644 --- a/mantle/kola/tests/ignition/empty.go +++ b/mantle/kola/tests/ignition/empty.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) // These tests require the kola key to be passed to the instance via cloud diff --git a/mantle/kola/tests/ignition/execution.go b/mantle/kola/tests/ignition/execution.go index 85a93fcb99ca051e09270b336579cd2763a6a597..aee4184607ee8bd15542882a268818652a087039 100644 --- a/mantle/kola/tests/ignition/execution.go +++ b/mantle/kola/tests/ignition/execution.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/journaldEntry.go b/mantle/kola/tests/ignition/journaldEntry.go index 16b711b8f106503031ad70ee616a1365e911825b..841df71360a5cb8bf9acdf27af054d3522106710 100644 --- a/mantle/kola/tests/ignition/journaldEntry.go +++ b/mantle/kola/tests/ignition/journaldEntry.go @@ -18,8 +18,8 @@ import ( "fmt" "strconv" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) const ignitionJournalMsgId = "57124006b5c94805b77ce473e92a8aeb" diff --git a/mantle/kola/tests/ignition/luks.go b/mantle/kola/tests/ignition/luks.go index 8fc407de5b0bc9c3e095e47b743ef95dcca87a3b..29c728394fef3044ef402f8d9446ecb040b888fc 100644 --- a/mantle/kola/tests/ignition/luks.go +++ b/mantle/kola/tests/ignition/luks.go @@ -6,14 +6,14 @@ import ( coreosarch "github.com/coreos/stream-metadata-go/arch" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - ut "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/unprivqemu" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + ut "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu" + "github.com/coreos/coreos-assembler/mantle/util" ) func init() { diff --git a/mantle/kola/tests/ignition/mount.go b/mantle/kola/tests/ignition/mount.go index 14e4dd2d2a71b9d361eb948946d1b619d37f585d..46527b5b8caea108519b9a6066efbb5a1b832d9d 100644 --- a/mantle/kola/tests/ignition/mount.go +++ b/mantle/kola/tests/ignition/mount.go @@ -19,12 +19,12 @@ import ( "path/filepath" "strings" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" "github.com/coreos/ignition/v2/config/v3_0/types" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" ) func init() { diff --git a/mantle/kola/tests/ignition/passwd.go b/mantle/kola/tests/ignition/passwd.go index 954d56f72fda409f2ea75f902662f240e821a355..2c784a0e4dc5016a1a1a39bf8261f7019cef8f91 100644 --- a/mantle/kola/tests/ignition/passwd.go +++ b/mantle/kola/tests/ignition/passwd.go @@ -18,10 +18,10 @@ import ( "fmt" "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/qemufailure.go b/mantle/kola/tests/ignition/qemufailure.go index dbf66800be1da1be95b5d4c5b3b9d5e632f7815c..24888f9afd767de0a62b1c874da6ce95ef730c2e 100644 --- a/mantle/kola/tests/ignition/qemufailure.go +++ b/mantle/kola/tests/ignition/qemufailure.go @@ -21,11 +21,11 @@ import ( "github.com/pkg/errors" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/resource.go b/mantle/kola/tests/ignition/resource.go index 17027286c7dcd6f4155e6ff296622a166457d80e..cb95aff2b2b19353d04929520eb1cf417dbba7e8 100644 --- a/mantle/kola/tests/ignition/resource.go +++ b/mantle/kola/tests/ignition/resource.go @@ -23,11 +23,11 @@ import ( "github.com/pin/tftp" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/packet" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/packet" ) var ( diff --git a/mantle/kola/tests/ignition/security.go b/mantle/kola/tests/ignition/security.go index e964604a47debe978f1fd9fb6f2a17926142291e..178127cfea939aa0859692f3193c61e39c47c0bc 100644 --- a/mantle/kola/tests/ignition/security.go +++ b/mantle/kola/tests/ignition/security.go @@ -26,10 +26,10 @@ import ( "github.com/vincent-petithory/dataurl" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/packet" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/packet" ) var ( diff --git a/mantle/kola/tests/ignition/sethostname.go b/mantle/kola/tests/ignition/sethostname.go index 01b50f5c0fe477f467435a2f61f59ad1fc50f3e9..096edf9ad3883d4c40bee7924fbabeb3fb689ebc 100644 --- a/mantle/kola/tests/ignition/sethostname.go +++ b/mantle/kola/tests/ignition/sethostname.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/ssh.go b/mantle/kola/tests/ignition/ssh.go index e096b54dbd81777660b56cb2e32617af53f95bf6..d4f083d77c22b9bd09bd64e6ae686ce9871dba52 100644 --- a/mantle/kola/tests/ignition/ssh.go +++ b/mantle/kola/tests/ignition/ssh.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/symlink.go b/mantle/kola/tests/ignition/symlink.go index 407591a5401425c12dc86ed8cb251d5b0c580af7..588127146d9f4d2a89f80624d38ee1d36a8f8230 100644 --- a/mantle/kola/tests/ignition/symlink.go +++ b/mantle/kola/tests/ignition/symlink.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/systemd.go b/mantle/kola/tests/ignition/systemd.go index 62f07c1e036d8480804c23739ccd04d39ec4598a..3b26c678b4e342de7c62cf22df1bccd4b468cb65 100644 --- a/mantle/kola/tests/ignition/systemd.go +++ b/mantle/kola/tests/ignition/systemd.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/ignition/units.go b/mantle/kola/tests/ignition/units.go index b53ecb3a392b867c26c9eac182fa58df5cee0f0a..07077e03b0342057c8051f235e45e23bd2a5110f 100644 --- a/mantle/kola/tests/ignition/units.go +++ b/mantle/kola/tests/ignition/units.go @@ -15,9 +15,9 @@ package ignition import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/metadata/contents.go b/mantle/kola/tests/metadata/contents.go index 0fa85d1ec77da4aa445af40b64ed7ba335255e8e..fa8825a010cee5617581184666df7185f16c9280 100644 --- a/mantle/kola/tests/metadata/contents.go +++ b/mantle/kola/tests/metadata/contents.go @@ -17,9 +17,9 @@ package metadata import ( "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/misc/auth.go b/mantle/kola/tests/misc/auth.go index 944ffb9aff6f2d33120aa8625540c68a09af776f..de7719d1d8518b26a5e690cd74fd640f5eb4fb18 100644 --- a/mantle/kola/tests/misc/auth.go +++ b/mantle/kola/tests/misc/auth.go @@ -15,8 +15,8 @@ package misc import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) func init() { diff --git a/mantle/kola/tests/misc/aws.go b/mantle/kola/tests/misc/aws.go index 0b867b44bdccf0d1ad8a1dabaf869fbf044351e7..7e70053ab633ff09eb31470408c4c0177e1833d2 100644 --- a/mantle/kola/tests/misc/aws.go +++ b/mantle/kola/tests/misc/aws.go @@ -15,8 +15,8 @@ package misc import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) func init() { diff --git a/mantle/kola/tests/misc/boot-mirror.go b/mantle/kola/tests/misc/boot-mirror.go index 737f9bc6755f18927875b87c904ce8e34cfd0847..5cebca2d4fac68285f3384f27d138dbb2e8f063e 100644 --- a/mantle/kola/tests/misc/boot-mirror.go +++ b/mantle/kola/tests/misc/boot-mirror.go @@ -20,14 +20,14 @@ import ( coreosarch "github.com/coreos/stream-metadata-go/arch" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/unprivqemu" - ut "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu" + ut "github.com/coreos/coreos-assembler/mantle/util" ) var ( diff --git a/mantle/kola/tests/misc/files.go b/mantle/kola/tests/misc/files.go index cefae538aec4dbee98411455e58bb41906fcfee4..f8a5e3c116a976383f6727b3a9e84f694dfb9e6c 100644 --- a/mantle/kola/tests/misc/files.go +++ b/mantle/kola/tests/misc/files.go @@ -19,8 +19,8 @@ import ( "runtime" "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) func init() { diff --git a/mantle/kola/tests/misc/multipath.go b/mantle/kola/tests/misc/multipath.go index 9297943613991b65ee4399b8c2d67359150e4a3a..5bfc9125d55dd9908fa1872d493a778c386c7305 100644 --- a/mantle/kola/tests/misc/multipath.go +++ b/mantle/kola/tests/misc/multipath.go @@ -19,10 +19,10 @@ import ( coreosarch "github.com/coreos/stream-metadata-go/arch" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) var ( diff --git a/mantle/kola/tests/misc/network.go b/mantle/kola/tests/misc/network.go index 817ada47e2d9aea06eedcb5b22892f337ca6a23f..738a50c29568f96dc46022b570374ae80eb1dead 100644 --- a/mantle/kola/tests/misc/network.go +++ b/mantle/kola/tests/misc/network.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/unprivqemu" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu" + "github.com/coreos/coreos-assembler/mantle/util" ) func init() { diff --git a/mantle/kola/tests/misc/nfs.go b/mantle/kola/tests/misc/nfs.go index 87f18763f14502fbf2498ac6915ee0e6d771fe3c..df523c70080d7d99758814ea3cb263e1427f0017 100644 --- a/mantle/kola/tests/misc/nfs.go +++ b/mantle/kola/tests/misc/nfs.go @@ -19,10 +19,10 @@ import ( "path" "time" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( diff --git a/mantle/kola/tests/misc/selinux.go b/mantle/kola/tests/misc/selinux.go index 8d62bfeee8e19ee792363424b9c7381eda942b04..12e133169e66084aa84c59f3be525d2867b62e81 100644 --- a/mantle/kola/tests/misc/selinux.go +++ b/mantle/kola/tests/misc/selinux.go @@ -19,9 +19,9 @@ import ( "regexp" "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" ) func init() { diff --git a/mantle/kola/tests/misc/tls.go b/mantle/kola/tests/misc/tls.go index 9d5672108b23d193bdde299575d9c812b45a637b..f9406bf860c9ae71b106c5764fdc5214ef0b23d7 100644 --- a/mantle/kola/tests/misc/tls.go +++ b/mantle/kola/tests/misc/tls.go @@ -15,8 +15,8 @@ package misc import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) var ( diff --git a/mantle/kola/tests/misc/users.go b/mantle/kola/tests/misc/users.go index f320636992e41e3722e26440fe9aa257f124d912..70cc34e2d992c7666e067f416449dafd7aaaa75c 100644 --- a/mantle/kola/tests/misc/users.go +++ b/mantle/kola/tests/misc/users.go @@ -17,8 +17,8 @@ package misc import ( "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" ) func init() { diff --git a/mantle/kola/tests/ostree/basic.go b/mantle/kola/tests/ostree/basic.go index 3d3b13e1d03823f472cccf74db9c8a245e99a4d2..5ee804c4bdb8f1bca1327a00388bb4d7cf27fba1 100644 --- a/mantle/kola/tests/ostree/basic.go +++ b/mantle/kola/tests/ostree/basic.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" ) // the "basic" test is only supported on 'rhcos' for now because of how diff --git a/mantle/kola/tests/ostree/unlock.go b/mantle/kola/tests/ostree/unlock.go index 126239fb363f0c73ea8cc64e0edfbc9c7949c266..3188abad4bd2faf7acd9ed8f4f41dfe627d1862f 100644 --- a/mantle/kola/tests/ostree/unlock.go +++ b/mantle/kola/tests/ostree/unlock.go @@ -17,11 +17,11 @@ package ostree import ( "fmt" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/podman/podman.go b/mantle/kola/tests/podman/podman.go index 2c311c3978f91d69b6fe8b820ebc01cf2bd557d1..83cccada3674d9e87b97d5cca4278576709b7b81 100644 --- a/mantle/kola/tests/podman/podman.go +++ b/mantle/kola/tests/podman/podman.go @@ -21,12 +21,12 @@ import ( "strings" "time" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - tutil "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + tutil "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" ) // init runs when the package is imported and takes care of registering tests diff --git a/mantle/kola/tests/rhcos/sssd.go b/mantle/kola/tests/rhcos/sssd.go index e135675dba0289414ea70dbb31a3ebbd0de7edcd..a390bde68b041a421db8db7d1e21be53f2eb7e33 100644 --- a/mantle/kola/tests/rhcos/sssd.go +++ b/mantle/kola/tests/rhcos/sssd.go @@ -15,10 +15,10 @@ package rhcos import ( - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/rhcos/upgrade.go b/mantle/kola/tests/rhcos/upgrade.go index 92afdbd2302aeb9a4af45a71fbc441170e283c63..c9230332093337d1c5de125437a8e0d571cf4e0c 100644 --- a/mantle/kola/tests/rhcos/upgrade.go +++ b/mantle/kola/tests/rhcos/upgrade.go @@ -27,14 +27,14 @@ import ( cosa "github.com/coreos/coreos-assembler/pkg/builds" coreosarch "github.com/coreos/stream-metadata-go/arch" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/platform/machine/unprivqemu" - installer "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu" + installer "github.com/coreos/coreos-assembler/mantle/util" ) func init() { diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go index 5aa7afe55b244eea3540beabb71b030604041135..8316684cb6f4c6684aa7bffbcb614c51a96a17c2 100644 --- a/mantle/kola/tests/rpmostree/deployments.go +++ b/mantle/kola/tests/rpmostree/deployments.go @@ -19,10 +19,10 @@ import ( "reflect" "regexp" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) func init() { diff --git a/mantle/kola/tests/rpmostree/status.go b/mantle/kola/tests/rpmostree/status.go index 667abb304aef2e7d74cccac81c6207ee8f2c0a7c..d9bde0b98dd94f657bec9ff5fe14f9879e3c72e9 100644 --- a/mantle/kola/tests/rpmostree/status.go +++ b/mantle/kola/tests/rpmostree/status.go @@ -19,10 +19,10 @@ import ( "regexp" "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" ) func init() { diff --git a/mantle/kola/tests/upgrade/basic.go b/mantle/kola/tests/upgrade/basic.go index 9a7800fe66b8b23f34a5920e7785cb4b5d6d0950..b1849b6a648d7b603e45834d29ba6d8a9bb59127 100644 --- a/mantle/kola/tests/upgrade/basic.go +++ b/mantle/kola/tests/upgrade/basic.go @@ -25,18 +25,18 @@ import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/kola" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/kola/register" - "github.com/coreos/mantle/kola/tests/util" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/kola" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/kola/register" + "github.com/coreos/coreos-assembler/mantle/kola/tests/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const workdir = "/var/srv/upgrade" const ostreeRepo = workdir + "/repo" -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kola/tests/upgrade") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola/tests/upgrade") func init() { register.RegisterUpgradeTest(®ister.Test{ diff --git a/mantle/kola/tests/util/containers.go b/mantle/kola/tests/util/containers.go index 3325116054570e41c33b802c6834f8360cd23f57..829a0974bd9a388d0662fa86fac26fa6e6d93005 100644 --- a/mantle/kola/tests/util/containers.go +++ b/mantle/kola/tests/util/containers.go @@ -17,8 +17,8 @@ package util import ( "strings" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/platform" ) // GenPodmanScratchContainer creates a podman scratch container out of binaries from the host diff --git a/mantle/kola/tests/util/luks.go b/mantle/kola/tests/util/luks.go index a256930ee53635323aa64731e3c2ac4f61ca389c..1c51eac9e8173d37c227286ebaeb67b588602382 100644 --- a/mantle/kola/tests/util/luks.go +++ b/mantle/kola/tests/util/luks.go @@ -16,8 +16,8 @@ package util import ( "regexp" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/platform" ) // TangServer contains fields required to set up a tang server diff --git a/mantle/kola/tests/util/rpmostree.go b/mantle/kola/tests/util/rpmostree.go index e17ee4bafb1b054c1cf318603484a2cb8fe18bab..35e66b6741d30b79187e6b968d340fd209fe6fdd 100644 --- a/mantle/kola/tests/util/rpmostree.go +++ b/mantle/kola/tests/util/rpmostree.go @@ -20,14 +20,14 @@ import ( "fmt" "time" - "github.com/coreos/mantle/kola/cluster" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/kola/cluster" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "kola/tests/util/rpmostree") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola/tests/util/rpmostree") ) // RpmOstreeDeployment represents some of the data of an rpm-ostree deployment diff --git a/mantle/lang/destructor/destructor.go b/mantle/lang/destructor/destructor.go index 5bf7e22369768de75d218fed496756f76d36ce0f..0a82a52c21df57c255cf48b47ea4df6c54242cc8 100644 --- a/mantle/lang/destructor/destructor.go +++ b/mantle/lang/destructor/destructor.go @@ -21,7 +21,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "lang/destructor") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "lang/destructor") ) // Destructor is a common interface for objects that need to be cleaned up. diff --git a/mantle/lang/maps/sorted.go b/mantle/lang/maps/sorted.go index fd9c2718de69dd9b3062e83398f1d8a718b861f7..e60b5e1bbeaa635a4cfa7c7a5609978915b979eb 100644 --- a/mantle/lang/maps/sorted.go +++ b/mantle/lang/maps/sorted.go @@ -18,7 +18,7 @@ import ( "reflect" "sort" - "github.com/coreos/mantle/lang/natsort" + "github.com/coreos/coreos-assembler/mantle/lang/natsort" ) // Keys returns a map's keys as an unordered slice of strings. @@ -47,7 +47,7 @@ func SortedKeys(m interface{}) []string { } // NaturalKeys returns a map's keys as a natural sorted slice of strings. -// See github.com/coreos/mantle/lang/natsort +// See github.com/coreos/coreos-assembler/mantle/lang/natsort func NaturalKeys(m interface{}) []string { keys := Keys(m) natsort.Strings(keys) diff --git a/mantle/lang/maps/sorted_test.go b/mantle/lang/maps/sorted_test.go index e6af0761d37f0031bd65d8c9d42ac83054f5fac0..982e41c78166266f0b23b830959f7c903a3dd877 100644 --- a/mantle/lang/maps/sorted_test.go +++ b/mantle/lang/maps/sorted_test.go @@ -18,7 +18,7 @@ import ( "sort" "testing" - "github.com/coreos/mantle/lang/natsort" + "github.com/coreos/coreos-assembler/mantle/lang/natsort" ) var ( diff --git a/mantle/network/bufnet/pipe.go b/mantle/network/bufnet/pipe.go index de453cf310caba8ebc8671f8c390a3c6db36a066..8a7e0b9cb63785aeb162c53c8de47b4098959e79 100644 --- a/mantle/network/bufnet/pipe.go +++ b/mantle/network/bufnet/pipe.go @@ -11,7 +11,7 @@ import ( "net" "time" - "github.com/coreos/mantle/lang/bufpipe" + "github.com/coreos/coreos-assembler/mantle/lang/bufpipe" ) // Pipe creates a synchronous, in-memory, full duplex diff --git a/mantle/network/journal/_test/main.go b/mantle/network/journal/_test/main.go index 3b3c4b7dc1b9a7f8eb719296a4e154681e87c6d6..e7d8d05f654d229aea030b69f3366c8ff7bda677 100644 --- a/mantle/network/journal/_test/main.go +++ b/mantle/network/journal/_test/main.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/coreos/mantle/network/journal" + "github.com/coreos/coreos-assembler/mantle/network/journal" ) func main() { diff --git a/mantle/network/journal/record.go b/mantle/network/journal/record.go index 4800398c4c355a74f427b420667f77449cb1cdc9..3ea83c09d389534d67a78beb6f5855e615bb6885 100644 --- a/mantle/network/journal/record.go +++ b/mantle/network/journal/record.go @@ -22,7 +22,7 @@ import ( "github.com/kballard/go-shellquote" "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/system/exec" ) type Recorder struct { diff --git a/mantle/network/journal/record_test.go b/mantle/network/journal/record_test.go index 01ec4400a165ecba4028f368592afe0a8ad29767..270a284d9ba899e5b9d3824e9b312cece21b27b1 100644 --- a/mantle/network/journal/record_test.go +++ b/mantle/network/journal/record_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/coreos/mantle/network/mockssh" + "github.com/coreos/coreos-assembler/mantle/network/mockssh" ) const ( diff --git a/mantle/network/mockssh/mockssh.go b/mantle/network/mockssh/mockssh.go index bfb146be753d8f0e2402b18eba80cfdacb2f84db..e0eed48393cdba339ee0984484dae14bb4cd7c5b 100644 --- a/mantle/network/mockssh/mockssh.go +++ b/mantle/network/mockssh/mockssh.go @@ -29,7 +29,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/network/bufnet" + "github.com/coreos/coreos-assembler/mantle/network/bufnet" ) const ( diff --git a/mantle/network/nsdialer.go b/mantle/network/nsdialer.go index 584421b427312571b41f1d9c1072e90d15adf8f4..7df274b66e14b7ddbc920c6014bef65c53648589 100644 --- a/mantle/network/nsdialer.go +++ b/mantle/network/nsdialer.go @@ -19,7 +19,7 @@ import ( "github.com/vishvananda/netns" - "github.com/coreos/mantle/system/ns" + "github.com/coreos/coreos-assembler/mantle/system/ns" ) // NsDialer is a RetryDialer that can enter any network namespace. diff --git a/mantle/network/ntp/_ntpd/ntpd.go b/mantle/network/ntp/_ntpd/ntpd.go index 5a48c1eca7a22960363dc8b682953604f5b8da1e..80ea543c353bababd95bf8469d23b9f4d32538c8 100644 --- a/mantle/network/ntp/_ntpd/ntpd.go +++ b/mantle/network/ntp/_ntpd/ntpd.go @@ -21,11 +21,11 @@ import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/network/ntp" + "github.com/coreos/coreos-assembler/mantle/network/ntp" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "main") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "main") now = flag.String("now", "", "Internal time for the server.") leap = flag.String("leap", "", "Handle a leap second.") ) diff --git a/mantle/network/ntp/server.go b/mantle/network/ntp/server.go index 6e927e394bb7bf750076fbcb5e2719b500a9de29..0c2a4c50cf6705cbbba36de0ccc48e2236db80c3 100644 --- a/mantle/network/ntp/server.go +++ b/mantle/network/ntp/server.go @@ -21,10 +21,10 @@ import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/network/neterror" + "github.com/coreos/coreos-assembler/mantle/network/neterror" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "network/ntp") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "network/ntp") // BUG(marineam): Since our clock source is UTC instead of TAI or some type of // monotonic clock, trying to use this server during a real leap second will diff --git a/mantle/platform/api/aliyun/api.go b/mantle/platform/api/aliyun/api.go index c01e2fd41a5c5d5980efeaa1f5d50c08cc0a4fb3..1b19d1b24f6d0bce870aa70b255200beb9fbcac5 100644 --- a/mantle/platform/api/aliyun/api.go +++ b/mantle/platform/api/aliyun/api.go @@ -20,9 +20,9 @@ import ( "sort" "time" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" "github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/multierror" @@ -31,7 +31,7 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/aliyun") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/aliyun") var defaultConnectTimeout = 15 * time.Second var defaultReadTimeout = 30 * time.Second diff --git a/mantle/platform/api/aws/api.go b/mantle/platform/api/aws/api.go index 3d1e390ff8bf27cedebc1eca98020bf8c5168996..1487e66d78a02e71f2ade910f25bbb2f6ff5a42f 100644 --- a/mantle/platform/api/aws/api.go +++ b/mantle/platform/api/aws/api.go @@ -27,10 +27,10 @@ import ( "github.com/aws/aws-sdk-go/service/sts" "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/aws") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/aws") type Options struct { *platform.Options diff --git a/mantle/platform/api/aws/ec2.go b/mantle/platform/api/aws/ec2.go index 234c5753d10378d5f172641927d26d4e6783d1ed..2d44aab5d53d5690098796606ec926447595f33c 100644 --- a/mantle/platform/api/aws/ec2.go +++ b/mantle/platform/api/aws/ec2.go @@ -25,7 +25,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) type RegionKind int diff --git a/mantle/platform/api/aws/iam.go b/mantle/platform/api/aws/iam.go index a7e9a178c0ea0fba7af1b5550dae1086edc4b241..753d3311c4e49783e4585fda9d3a6572ab75e87f 100644 --- a/mantle/platform/api/aws/iam.go +++ b/mantle/platform/api/aws/iam.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) const ( diff --git a/mantle/platform/api/aws/images.go b/mantle/platform/api/aws/images.go index 0bc4bed270fc76d2d76b64fd5506795d9262773f..c465ad4405ceee5f74669aead2551261686d240c 100644 --- a/mantle/platform/api/aws/images.go +++ b/mantle/platform/api/aws/images.go @@ -29,7 +29,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) // The default size of Container Linux disks on AWS, in GiB. See discussion in diff --git a/mantle/platform/api/azure/api.go b/mantle/platform/api/azure/api.go index 2dd84c18cca6cb0cad66ea40c839582a88d77359..a098a49b656a890421250320a0eb0776e5605c71 100644 --- a/mantle/platform/api/azure/api.go +++ b/mantle/platform/api/azure/api.go @@ -31,11 +31,11 @@ import ( "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/coreos/pkg/capnslog" - internalAuth "github.com/coreos/mantle/auth" + internalAuth "github.com/coreos/coreos-assembler/mantle/auth" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/azure") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/azure") ) type API struct { diff --git a/mantle/platform/api/azure/groups.go b/mantle/platform/api/azure/groups.go index b346f9976890bb397b30fdc060af1a8ef2571c09..f8c9b568a47d547e664b5a5b5872c0338501f131 100644 --- a/mantle/platform/api/azure/groups.go +++ b/mantle/platform/api/azure/groups.go @@ -19,7 +19,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/resources/resources" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) func (a *API) CreateResourceGroup(prefix string) (string, error) { diff --git a/mantle/platform/api/azure/instance.go b/mantle/platform/api/azure/instance.go index 51886aaf1fae6a514e7557e005fa5e053f819c99..6042ef8005a43e0432d0f1826481775f7f0b16d9 100644 --- a/mantle/platform/api/azure/instance.go +++ b/mantle/platform/api/azure/instance.go @@ -27,7 +27,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/compute" "github.com/Azure/azure-sdk-for-go/arm/network" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) type Machine struct { diff --git a/mantle/platform/api/azure/network.go b/mantle/platform/api/azure/network.go index d71f2ca93a3b24289bde380feb930704b0941750..26dc6c086ab16dbca2c1e024f97465b7e9a18d57 100644 --- a/mantle/platform/api/azure/network.go +++ b/mantle/platform/api/azure/network.go @@ -19,7 +19,7 @@ import ( "github.com/Azure/azure-sdk-for-go/arm/network" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( diff --git a/mantle/platform/api/azure/options.go b/mantle/platform/api/azure/options.go index c245161dca35c55bdc268a42cfa38d3d790c260d..cc73229eab339ae403f3ea5c4c49b5a2d7305402 100644 --- a/mantle/platform/api/azure/options.go +++ b/mantle/platform/api/azure/options.go @@ -15,7 +15,7 @@ package azure import ( - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) type Options struct { diff --git a/mantle/platform/api/do/api.go b/mantle/platform/api/do/api.go index 75a7a9eb73edc7134f600745cd28cc8dece36840..0ffc3a68253be8011cdc8d51c17448b20f099742 100644 --- a/mantle/platform/api/do/api.go +++ b/mantle/platform/api/do/api.go @@ -24,13 +24,13 @@ import ( "github.com/digitalocean/godo" "golang.org/x/oauth2" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/do") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/do") ) type Options struct { diff --git a/mantle/platform/api/esx/api.go b/mantle/platform/api/esx/api.go index 4b9075026a309d5b80142d33fd126ba42e13f8e7..9f379cd25561ca33270da529eeb4196b40e7542c 100644 --- a/mantle/platform/api/esx/api.go +++ b/mantle/platform/api/esx/api.go @@ -37,9 +37,9 @@ import ( "github.com/vmware/govmomi/vim25/soap" "github.com/vmware/govmomi/vim25/types" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type Options struct { @@ -56,7 +56,7 @@ type Options struct { BaseVMName string } -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/esx") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/esx") type API struct { options *Options diff --git a/mantle/platform/api/gcloud/api.go b/mantle/platform/api/gcloud/api.go index 889d634cfa9e389298aeb3ea385cb2aa44d40d5f..3b210ad5bf0753571b4c80597606f09c393240e7 100644 --- a/mantle/platform/api/gcloud/api.go +++ b/mantle/platform/api/gcloud/api.go @@ -24,12 +24,12 @@ import ( "github.com/coreos/pkg/capnslog" "google.golang.org/api/compute/v1" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/platform" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/gcloud") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/gcloud") ) type Options struct { diff --git a/mantle/platform/api/gcloud/compute.go b/mantle/platform/api/gcloud/compute.go index f2f1d68014aa57d26a297d8e08a0bb436a62774f..88416501c393b99999291a262d4ca057f9874ea9 100644 --- a/mantle/platform/api/gcloud/compute.go +++ b/mantle/platform/api/gcloud/compute.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/util" "golang.org/x/crypto/ssh/agent" "google.golang.org/api/compute/v1" ) diff --git a/mantle/platform/api/ibmcloud/api.go b/mantle/platform/api/ibmcloud/api.go index dbcd51e56eefd06575db312d9dbcf101d6a62c2f..d6aef2e509a34044ed50b5ab0534d31a2ba2415b 100644 --- a/mantle/platform/api/ibmcloud/api.go +++ b/mantle/platform/api/ibmcloud/api.go @@ -32,11 +32,11 @@ import ( "github.com/IBM-Cloud/bluemix-go/rest" bluemixsession "github.com/IBM-Cloud/bluemix-go/session" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" "github.com/coreos/pkg/capnslog" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/ibmcloud") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/ibmcloud") var ( tokenProviderEndpoint = "https://iam.cloud.ibm.com" diff --git a/mantle/platform/api/openstack/api.go b/mantle/platform/api/openstack/api.go index a3f62981a3eb9ee58c8dc2e04a11d49a57bd9685..e9ae1d00bfc1abd6b92165d1d35495f5b8a78089 100644 --- a/mantle/platform/api/openstack/api.go +++ b/mantle/platform/api/openstack/api.go @@ -38,14 +38,14 @@ import ( "github.com/gophercloud/utils/openstack/clientconfig" utilsSecurityGroups "github.com/gophercloud/utils/openstack/networking/v2/extensions/security/groups" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" "gopkg.in/yaml.v2" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/openstack") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/openstack") ) type Options struct { diff --git a/mantle/platform/api/packet/api.go b/mantle/platform/api/packet/api.go index 9b587ee1aa2a6bae362b646e1bd21b18c7c61028..eeda7f2133dde968eda6ef52b175d9519a28eb79 100644 --- a/mantle/platform/api/packet/api.go +++ b/mantle/platform/api/packet/api.go @@ -29,11 +29,11 @@ import ( "github.com/packethost/packngo" "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/auth" - "github.com/coreos/mantle/fcos" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/auth" + "github.com/coreos/coreos-assembler/mantle/fcos" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) const ( @@ -49,7 +49,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/api/packet") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/packet") defaultPlan = map[string]string{ "arm64": "c1.large.arm", diff --git a/mantle/platform/cluster.go b/mantle/platform/cluster.go index ebdc3786f998e6b641463ccb34dfdeaaa87d7f63..a3a72a7bb7a88a4ef2f8236f43dea3316ec64547 100644 --- a/mantle/platform/cluster.go +++ b/mantle/platform/cluster.go @@ -29,7 +29,7 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - platformConf "github.com/coreos/mantle/platform/conf" + platformConf "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type BaseCluster struct { diff --git a/mantle/platform/conf/conf.go b/mantle/platform/conf/conf.go index 832a4fc29f9efe97ca53cba3ad4833dd131fab83..05c30716c6cb9a86a325b446366ef45ce7f952f0 100644 --- a/mantle/platform/conf/conf.go +++ b/mantle/platform/conf/conf.go @@ -71,7 +71,7 @@ const ( FailWarnings ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/conf") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/conf") // UserData is an immutable, unvalidated configuration for a CoreOS // machine. diff --git a/mantle/platform/conf/conf_test.go b/mantle/platform/conf/conf_test.go index d74276d9da3ef4c83a9b171b91366eb283db7564..f8e099fdd819ea1c79896601b376de27e7648ae8 100644 --- a/mantle/platform/conf/conf_test.go +++ b/mantle/platform/conf/conf_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/coreos/mantle/network" + "github.com/coreos/coreos-assembler/mantle/network" ) func TestConfCopyKey(t *testing.T) { diff --git a/mantle/platform/flight.go b/mantle/platform/flight.go index 6aeef5bae08ce7871febed1265f1f8a1b0c72618..6e91242fa56b35bbe417b2787898316fed0cd234 100644 --- a/mantle/platform/flight.go +++ b/mantle/platform/flight.go @@ -22,7 +22,7 @@ import ( "github.com/pborman/uuid" "golang.org/x/crypto/ssh/agent" - "github.com/coreos/mantle/network" + "github.com/coreos/coreos-assembler/mantle/network" ) type BaseFlight struct { diff --git a/mantle/platform/journal.go b/mantle/platform/journal.go index 8742edbd06885994630a1ca2d6138fb6492a32b9..589a83af8f03b2d69beef27d972704ef9cc9033b 100644 --- a/mantle/platform/journal.go +++ b/mantle/platform/journal.go @@ -26,8 +26,8 @@ import ( "github.com/coreos/pkg/multierror" "github.com/pkg/errors" - "github.com/coreos/mantle/network/journal" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/network/journal" + "github.com/coreos/coreos-assembler/mantle/util" ) // Journal manages recording the journal of a Machine. diff --git a/mantle/platform/local/cluster.go b/mantle/platform/local/cluster.go index c3fd71025b1234d41f5cdf6314eb747e796b7bb3..a85bf9d14b0d341ad89e6a5bcd715afbedd28137 100644 --- a/mantle/platform/local/cluster.go +++ b/mantle/platform/local/cluster.go @@ -20,10 +20,10 @@ import ( "github.com/vishvananda/netlink" "github.com/vishvananda/netns" - "github.com/coreos/mantle/lang/destructor" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/system/exec" - "github.com/coreos/mantle/system/ns" + "github.com/coreos/coreos-assembler/mantle/lang/destructor" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/system/ns" ) type LocalCluster struct { diff --git a/mantle/platform/local/configdrive.go b/mantle/platform/local/configdrive.go index 1515a24f193ed493be2494d766712920d056c503..ddc1f4d0ec4a2b2c2fada523b380066367508d20 100644 --- a/mantle/platform/local/configdrive.go +++ b/mantle/platform/local/configdrive.go @@ -18,7 +18,7 @@ import ( "os" "path" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) // MakeConfigDrive creates a config drive directory tree under outputDir diff --git a/mantle/platform/local/dnsmasq.go b/mantle/platform/local/dnsmasq.go index 64f4d7bfbdcb8cbfec2611957312e1bde6c22932..fc3ddf378df96c4b2981b0cbe266986ed4e3c664 100644 --- a/mantle/platform/local/dnsmasq.go +++ b/mantle/platform/local/dnsmasq.go @@ -22,8 +22,8 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/vishvananda/netlink" - "github.com/coreos/mantle/system/exec" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/util" ) type Interface struct { @@ -94,7 +94,7 @@ dhcp-host={{.HardwareAddr}}{{template "ips" .DHCPv4}}{{template "ips" .DHCPv6}} ` ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/local") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/local") func newInterface(s byte, i uint16) *Interface { return &Interface{ diff --git a/mantle/platform/local/flight.go b/mantle/platform/local/flight.go index c0f4b2804378399c043f507924fd636d93eb3817..93e1a4f210d40a1ce50ba41db2a41fd38677a417 100644 --- a/mantle/platform/local/flight.go +++ b/mantle/platform/local/flight.go @@ -18,11 +18,11 @@ package local import ( "github.com/vishvananda/netns" - "github.com/coreos/mantle/lang/destructor" - "github.com/coreos/mantle/network" - "github.com/coreos/mantle/network/ntp" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/system/ns" + "github.com/coreos/coreos-assembler/mantle/lang/destructor" + "github.com/coreos/coreos-assembler/mantle/network" + "github.com/coreos/coreos-assembler/mantle/network/ntp" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/system/ns" ) const ( diff --git a/mantle/platform/machine/aws/cluster.go b/mantle/platform/machine/aws/cluster.go index 700fe6291585b5a94984af01d34984ba88abbca6..fd0f60ada055ff5cf7693cd71739efe4004b385e 100644 --- a/mantle/platform/machine/aws/cluster.go +++ b/mantle/platform/machine/aws/cluster.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/aws/flight.go b/mantle/platform/machine/aws/flight.go index cdf6e2abe8cd7874d0ff5a5bb69284cbb20fc252..a5f5918888f0435d481b2da01d698ae518942f62 100644 --- a/mantle/platform/machine/aws/flight.go +++ b/mantle/platform/machine/aws/flight.go @@ -20,9 +20,9 @@ import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/aws" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/aws" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -30,7 +30,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/aws") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/aws") ) type flight struct { diff --git a/mantle/platform/machine/aws/machine.go b/mantle/platform/machine/aws/machine.go index 929ceddc2b67eabf138fe37bdbce4b7ddabfdc09..0e6b3218f65e52a19d841fe84d07ea1a81e1333b 100644 --- a/mantle/platform/machine/aws/machine.go +++ b/mantle/platform/machine/aws/machine.go @@ -24,8 +24,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/util" ) type machine struct { diff --git a/mantle/platform/machine/azure/cluster.go b/mantle/platform/machine/azure/cluster.go index 4dd749658daa79c3ac67bfcb1fbf37ec6defc451..68eeda5be464963b8be1915d59e9752f298d1001 100644 --- a/mantle/platform/machine/azure/cluster.go +++ b/mantle/platform/machine/azure/cluster.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/azure/flight.go b/mantle/platform/machine/azure/flight.go index 62a801d29a02451f86e90c48c6f5db7edc5e78f4..9c1da068e9cf25feb5469c579d1765dd81600ee5 100644 --- a/mantle/platform/machine/azure/flight.go +++ b/mantle/platform/machine/azure/flight.go @@ -18,9 +18,9 @@ import ( "github.com/coreos/pkg/capnslog" "github.com/pkg/errors" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/azure" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/azure" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -28,7 +28,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/azure") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/azure") ) type flight struct { diff --git a/mantle/platform/machine/azure/machine.go b/mantle/platform/machine/azure/machine.go index a15574e91f0731ecd8052d737239b7dcfbbd6be5..d2c4a009e31a6442c8cc21a0506b46b45e019add 100644 --- a/mantle/platform/machine/azure/machine.go +++ b/mantle/platform/machine/azure/machine.go @@ -22,8 +22,8 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/azure" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/azure" ) type machine struct { diff --git a/mantle/platform/machine/do/cluster.go b/mantle/platform/machine/do/cluster.go index 9fd79d5d6f6f4ba6ceaa5c4c45a9856f1a67b7ee..87d06569d17e646123f717be2f57b8b85ce0eeb1 100644 --- a/mantle/platform/machine/do/cluster.go +++ b/mantle/platform/machine/do/cluster.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/do/flight.go b/mantle/platform/machine/do/flight.go index 5853da2da69bcb8cf0eb9c446b18d024b3d612cd..70d1a1bb5a65f7410b4f096bbd7b51ece544c90d 100644 --- a/mantle/platform/machine/do/flight.go +++ b/mantle/platform/machine/do/flight.go @@ -20,9 +20,9 @@ import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/do" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/do" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -30,7 +30,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/do") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/do") ) type flight struct { diff --git a/mantle/platform/machine/do/machine.go b/mantle/platform/machine/do/machine.go index 493aa36af2c41f5145fcfd6d6bf41f0d407cec3d..b2b6fb3a8afeceece3a97c19733cb08617475409 100644 --- a/mantle/platform/machine/do/machine.go +++ b/mantle/platform/machine/do/machine.go @@ -22,7 +22,7 @@ import ( "github.com/digitalocean/godo" "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) type machine struct { diff --git a/mantle/platform/machine/esx/cluster.go b/mantle/platform/machine/esx/cluster.go index 023586db15a3834f9dc48e65946b970693a40385..13478dbfb92e620327c0952369011f97ac4deb37 100644 --- a/mantle/platform/machine/esx/cluster.go +++ b/mantle/platform/machine/esx/cluster.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/coreos/mantle/platform" - platformConf "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + platformConf "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/esx/flight.go b/mantle/platform/machine/esx/flight.go index c67712208941bd791e23f5e45583d18200b0979e..1e496d85d63167e4f2755510bc8597812f4e42b5 100644 --- a/mantle/platform/machine/esx/flight.go +++ b/mantle/platform/machine/esx/flight.go @@ -18,9 +18,9 @@ package esx import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/esx" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/esx" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -28,7 +28,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/esx") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/esx") ) type flight struct { diff --git a/mantle/platform/machine/esx/machine.go b/mantle/platform/machine/esx/machine.go index ca1f548363f179103a32307628abb2076bf2a214..b168809eaa7a4e07dd55df7dc480f1c530c28689 100644 --- a/mantle/platform/machine/esx/machine.go +++ b/mantle/platform/machine/esx/machine.go @@ -21,8 +21,8 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/esx" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/esx" "github.com/pkg/errors" ) diff --git a/mantle/platform/machine/gcloud/cluster.go b/mantle/platform/machine/gcloud/cluster.go index ff0ab8befc01ab36c1bbcaafa791cf2b7225e4a0..fedee22cf848d96011355531d63473b31617684f 100644 --- a/mantle/platform/machine/gcloud/cluster.go +++ b/mantle/platform/machine/gcloud/cluster.go @@ -22,9 +22,9 @@ import ( "golang.org/x/crypto/ssh/agent" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/gcloud" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/gcloud/flight.go b/mantle/platform/machine/gcloud/flight.go index f6da9ae2a5ac339f577e0ccfeedc12be890439ac..75f3fbc175a716e8ac08b4d9951970f118eb19fe 100644 --- a/mantle/platform/machine/gcloud/flight.go +++ b/mantle/platform/machine/gcloud/flight.go @@ -19,9 +19,9 @@ package gcloud import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/gcloud" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/gcloud" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type flight struct { @@ -34,7 +34,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/gcloud") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/gcloud") ) func NewFlight(opts *gcloud.Options) (platform.Flight, error) { diff --git a/mantle/platform/machine/gcloud/machine.go b/mantle/platform/machine/gcloud/machine.go index 54b89ae5d462459db354f6acd6c17c31df6bec08..b6afae64d322fb969de3775ca9c127a464515633 100644 --- a/mantle/platform/machine/gcloud/machine.go +++ b/mantle/platform/machine/gcloud/machine.go @@ -21,7 +21,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) type machine struct { diff --git a/mantle/platform/machine/openstack/cluster.go b/mantle/platform/machine/openstack/cluster.go index 59fcf2ec00b0e92ab6deee8ea55168396a1c667a..a2aced336e6e8f24b3c023f6c1b9d45f3035dd83 100644 --- a/mantle/platform/machine/openstack/cluster.go +++ b/mantle/platform/machine/openstack/cluster.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/openstack/flight.go b/mantle/platform/machine/openstack/flight.go index 862f0c5ebe7a413c56cea1a91490105c7fce936e..59c0c59eeb4380ee6101cb2cc8cdc27619f2e27d 100644 --- a/mantle/platform/machine/openstack/flight.go +++ b/mantle/platform/machine/openstack/flight.go @@ -17,9 +17,9 @@ package openstack import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/openstack" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/openstack" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -27,7 +27,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/openstack") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/openstack") ) type flight struct { diff --git a/mantle/platform/machine/openstack/machine.go b/mantle/platform/machine/openstack/machine.go index 34043235e1f33abf885e58d81fe12bed79b8d06a..0bf05f1d1bde69d9c835cfca31f92821caea8164 100644 --- a/mantle/platform/machine/openstack/machine.go +++ b/mantle/platform/machine/openstack/machine.go @@ -22,8 +22,8 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/openstack" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/openstack" ) type machine struct { diff --git a/mantle/platform/machine/packet/cluster.go b/mantle/platform/machine/packet/cluster.go index 533faa57dffdb3457ca036682cc6fc6778aaed69..9efca33d42b31d20eccd195a9dbaf25fffd7cfe8 100644 --- a/mantle/platform/machine/packet/cluster.go +++ b/mantle/platform/machine/packet/cluster.go @@ -21,9 +21,9 @@ import ( "os" "path/filepath" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/packet" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/packet" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) type cluster struct { diff --git a/mantle/platform/machine/packet/flight.go b/mantle/platform/machine/packet/flight.go index fe73157e56b957d8c765d28fc0db1deaa6ab0384..da813e36ef70666f9466ed554f08e2508022854a 100644 --- a/mantle/platform/machine/packet/flight.go +++ b/mantle/platform/machine/packet/flight.go @@ -18,9 +18,9 @@ package packet import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/api/packet" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/api/packet" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -28,7 +28,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/packet") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/packet") ) type flight struct { diff --git a/mantle/platform/machine/packet/machine.go b/mantle/platform/machine/packet/machine.go index f9ab80eaeed193eaae8cd27385d7784a0011771b..5317f3736a26b7724aefe5e6b93d32560fc23278 100644 --- a/mantle/platform/machine/packet/machine.go +++ b/mantle/platform/machine/packet/machine.go @@ -20,7 +20,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" "github.com/packethost/packngo" ) diff --git a/mantle/platform/machine/qemuiso/cluster.go b/mantle/platform/machine/qemuiso/cluster.go index e53c5fdd4c886f2eb708232d92f3cda446c82b8a..a73eb3e9da360b544a63315f771b5d3dd0a03b5b 100644 --- a/mantle/platform/machine/qemuiso/cluster.go +++ b/mantle/platform/machine/qemuiso/cluster.go @@ -26,9 +26,9 @@ import ( "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) // Cluster is a local cluster of QEMU-based virtual machines. diff --git a/mantle/platform/machine/qemuiso/flight.go b/mantle/platform/machine/qemuiso/flight.go index 62beae2c367475caf4ba2f68b464e7d4561ef18f..9d293eb81d4dfcedf430923628fbb0823184a2e6 100644 --- a/mantle/platform/machine/qemuiso/flight.go +++ b/mantle/platform/machine/qemuiso/flight.go @@ -17,8 +17,8 @@ package qemuiso import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -42,7 +42,7 @@ type flight struct { } var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/qemuiso") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/qemuiso") ) func NewFlight(opts *Options) (platform.Flight, error) { diff --git a/mantle/platform/machine/qemuiso/machine.go b/mantle/platform/machine/qemuiso/machine.go index f6ff8f76456df0689c21d1bacec6c54daf4130ed..1a45afb04aed46f1b106fc0a282df0e652b8c84f 100644 --- a/mantle/platform/machine/qemuiso/machine.go +++ b/mantle/platform/machine/qemuiso/machine.go @@ -22,7 +22,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) type machine struct { diff --git a/mantle/platform/machine/unprivqemu/cluster.go b/mantle/platform/machine/unprivqemu/cluster.go index af38a5950efdd4973875e3d6d2b85307f596ee42..096c4a84520f29176726a6f8cda300bfee4f9e63 100644 --- a/mantle/platform/machine/unprivqemu/cluster.go +++ b/mantle/platform/machine/unprivqemu/cluster.go @@ -26,9 +26,9 @@ import ( "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) // Cluster is a local cluster of QEMU-based virtual machines. diff --git a/mantle/platform/machine/unprivqemu/flight.go b/mantle/platform/machine/unprivqemu/flight.go index 6e97732926f8b271f17dc703ccdb8eb5a3ee304f..68f443303512e0e3b7f0b8c6666ce2bdb9d2afc2 100644 --- a/mantle/platform/machine/unprivqemu/flight.go +++ b/mantle/platform/machine/unprivqemu/flight.go @@ -17,8 +17,8 @@ package unprivqemu import ( "github.com/coreos/pkg/capnslog" - "github.com/coreos/mantle/platform" - "github.com/coreos/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform/conf" ) const ( @@ -52,7 +52,7 @@ type flight struct { } var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform/machine/qemu") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/machine/qemu") ) func NewFlight(opts *Options) (platform.Flight, error) { diff --git a/mantle/platform/machine/unprivqemu/machine.go b/mantle/platform/machine/unprivqemu/machine.go index f794c536dce1b8fc9fc9f3cebc5650a30af08158..c217bb0cff22889fbd01aaf8e6d30777d23338d0 100644 --- a/mantle/platform/machine/unprivqemu/machine.go +++ b/mantle/platform/machine/unprivqemu/machine.go @@ -22,7 +22,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/coreos/mantle/platform" + "github.com/coreos/coreos-assembler/mantle/platform" ) type machine struct { diff --git a/mantle/platform/metal.go b/mantle/platform/metal.go index 4ca4cf78ea8e6e3a37df5035e0b9e5e6c65a371a..e758b4b417ea01e3df7e606ecc146bb4d555b1d7 100644 --- a/mantle/platform/metal.go +++ b/mantle/platform/metal.go @@ -29,9 +29,9 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/system/exec" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/util" ) const ( diff --git a/mantle/platform/platform.go b/mantle/platform/platform.go index 767e21c253ca0aa5cc0b64e666f4366a63a051dc..e777317c2b6b309fdee2985fec91c1a76ed387a8 100644 --- a/mantle/platform/platform.go +++ b/mantle/platform/platform.go @@ -32,12 +32,12 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/net/context" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform") + plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform") ) // Name is a unique identifier for a platform. diff --git a/mantle/platform/qemu.go b/mantle/platform/qemu.go index c467e2574154dfdca7b3de32dd909480e3e4251c..135597aac0b415620713711504a023fd6e636571 100644 --- a/mantle/platform/qemu.go +++ b/mantle/platform/qemu.go @@ -42,13 +42,13 @@ import ( "syscall" "time" - "github.com/coreos/mantle/platform/conf" - "github.com/coreos/mantle/util" + "github.com/coreos/coreos-assembler/mantle/platform/conf" + "github.com/coreos/coreos-assembler/mantle/util" coreosarch "github.com/coreos/stream-metadata-go/arch" "github.com/digitalocean/go-qemu/qmp" - "github.com/coreos/mantle/system" - "github.com/coreos/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/system" + "github.com/coreos/coreos-assembler/mantle/system/exec" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/mantle/system/nproc.go b/mantle/system/nproc.go index b4606387cb8657aa178252532fb666a0f33fd00f..35dc1fc5178b681a9e74874c4e57f79ada84e997 100644 --- a/mantle/system/nproc.go +++ b/mantle/system/nproc.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/coreos/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/system/exec" ) // GetProcessors returns a count for number of cores we should use; diff --git a/mantle/system/ns/exec.go b/mantle/system/ns/exec.go index 12aec308719b2d75b8af7e79df0c79f48c8d812b..861ed41b7936f244357344f17629c12845203bc5 100644 --- a/mantle/system/ns/exec.go +++ b/mantle/system/ns/exec.go @@ -17,7 +17,7 @@ package ns import ( "github.com/vishvananda/netns" - "github.com/coreos/mantle/system/exec" + "github.com/coreos/coreos-assembler/mantle/system/exec" ) type Cmd struct { diff --git a/mantle/util/logio.go b/mantle/util/logio.go index 4aa69a284d41fd74ecc5aab8d3239741a0a79fcb..798934a5f8427aa7198628c3c89ae007ee856116 100644 --- a/mantle/util/logio.go +++ b/mantle/util/logio.go @@ -21,7 +21,7 @@ import ( "github.com/coreos/pkg/capnslog" ) -var plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "util") +var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "util") // LogFrom reads lines from reader r and sends them to logger l. func LogFrom(l capnslog.LogLevel, r io.Reader) {