From 8f0306771c5988a6f4d1cef0ccf07761a993f875 Mon Sep 17 00:00:00 2001 From: wangyueliang Date: Mon, 26 Feb 2024 14:19:35 +0800 Subject: [PATCH] change the mantle path from github.com/coreos/mantle` to `github.com/coreos/coreos-assembler/mantle`. [upstream] 7f4f952541ba9352c0cd8f5c1da639de2a1c163d --- docs/kola/adding-tests.md | 54 +++++++++---------- mantle/auth/azure.go | 2 +- mantle/cli/cli.go | 6 +-- mantle/cmd/kola/bootchart.go | 4 +- mantle/cmd/kola/console.go | 2 +- mantle/cmd/kola/devshell.go | 8 +-- mantle/cmd/kola/kola.go | 22 ++++---- mantle/cmd/kola/options.go | 14 ++--- mantle/cmd/kola/qemuexec.go | 6 +-- mantle/cmd/kola/spawn.go | 8 +-- mantle/cmd/kola/switchkernel.go | 6 +-- mantle/cmd/kola/testiso.go | 8 +-- mantle/cmd/kolet/kolet.go | 10 ++-- mantle/cmd/ore/aliyun.go | 2 +- mantle/cmd/ore/aliyun/aliyun.go | 6 +-- mantle/cmd/ore/aliyun/create-image.go | 2 +- mantle/cmd/ore/aws.go | 2 +- mantle/cmd/ore/aws/aws.go | 8 +-- mantle/cmd/ore/aws/copy-image.go | 2 +- mantle/cmd/ore/aws/list-regions.go | 2 +- mantle/cmd/ore/aws/upload.go | 4 +- mantle/cmd/ore/azure.go | 2 +- mantle/cmd/ore/azure/azure.go | 8 +-- mantle/cmd/ore/do.go | 2 +- mantle/cmd/ore/do/create-image.go | 6 +-- mantle/cmd/ore/do/do.go | 8 +-- mantle/cmd/ore/esx.go | 2 +- mantle/cmd/ore/esx/esx.go | 6 +-- mantle/cmd/ore/gcloud.go | 2 +- mantle/cmd/ore/gcloud/create-image.go | 2 +- mantle/cmd/ore/gcloud/delete-images.go | 2 +- mantle/cmd/ore/gcloud/deprecate-image.go | 2 +- mantle/cmd/ore/gcloud/gcloud.go | 8 +-- mantle/cmd/ore/gcloud/list.go | 2 +- mantle/cmd/ore/gcloud/promote-image.go | 2 +- mantle/cmd/ore/gcloud/upload.go | 2 +- mantle/cmd/ore/ibmcloud.go | 2 +- mantle/cmd/ore/ibmcloud/ibmcloud.go | 8 +-- mantle/cmd/ore/openstack.go | 2 +- mantle/cmd/ore/openstack/openstack.go | 6 +-- mantle/cmd/ore/ore.go | 2 +- mantle/cmd/ore/packet.go | 2 +- mantle/cmd/ore/packet/create-device.go | 2 +- mantle/cmd/ore/packet/packet.go | 8 +-- mantle/cmd/plume/cosa2stream.go | 2 +- mantle/cmd/plume/plume.go | 4 +- mantle/cmd/plume/release.go | 2 +- mantle/harness/_example/main.go | 2 +- mantle/harness/harness.go | 4 +- mantle/harness/reporters/json.go | 2 +- mantle/harness/reporters/reporter.go | 2 +- mantle/harness/suite.go | 4 +- mantle/harness/test.go | 2 +- mantle/kola/cluster/cluster.go | 6 +-- mantle/kola/harness.go | 52 +++++++++--------- mantle/kola/register/register.go | 4 +- mantle/kola/registry/registry.go | 26 ++++----- mantle/kola/tests/coretest/core.go | 4 +- mantle/kola/tests/coretest/testgroupglue.go | 2 +- mantle/kola/tests/crio/crio.go | 12 ++--- mantle/kola/tests/docker/docker.go | 12 ++--- mantle/kola/tests/etcd/rhcos.go | 10 ++-- mantle/kola/tests/etcd/util.go | 6 +-- mantle/kola/tests/fips/fips.go | 6 +-- mantle/kola/tests/ignition/empty.go | 6 +-- mantle/kola/tests/ignition/execution.go | 6 +-- mantle/kola/tests/ignition/journaldEntry.go | 4 +- mantle/kola/tests/ignition/luks.go | 16 +++--- mantle/kola/tests/ignition/mount.go | 10 ++-- mantle/kola/tests/ignition/passwd.go | 8 +-- mantle/kola/tests/ignition/qemufailure.go | 10 ++-- mantle/kola/tests/ignition/resource.go | 10 ++-- mantle/kola/tests/ignition/security.go | 8 +-- mantle/kola/tests/ignition/sethostname.go | 6 +-- mantle/kola/tests/ignition/ssh.go | 6 +-- mantle/kola/tests/ignition/symlink.go | 6 +-- mantle/kola/tests/ignition/systemd.go | 6 +-- mantle/kola/tests/ignition/units.go | 6 +-- mantle/kola/tests/metadata/contents.go | 6 +-- mantle/kola/tests/misc/auth.go | 4 +- mantle/kola/tests/misc/aws.go | 4 +- mantle/kola/tests/misc/boot-mirror.go | 16 +++--- mantle/kola/tests/misc/files.go | 4 +- mantle/kola/tests/misc/multipath.go | 8 +-- mantle/kola/tests/misc/network.go | 12 ++--- mantle/kola/tests/misc/nfs.go | 8 +-- mantle/kola/tests/misc/selinux.go | 6 +-- mantle/kola/tests/misc/tls.go | 4 +- mantle/kola/tests/misc/users.go | 4 +- mantle/kola/tests/ostree/basic.go | 8 +-- mantle/kola/tests/ostree/unlock.go | 10 ++-- mantle/kola/tests/podman/podman.go | 12 ++--- mantle/kola/tests/rhcos/sssd.go | 8 +-- mantle/kola/tests/rhcos/upgrade.go | 16 +++--- mantle/kola/tests/rpmostree/deployments.go | 8 +-- mantle/kola/tests/rpmostree/status.go | 8 +-- mantle/kola/tests/upgrade/basic.go | 14 ++--- mantle/kola/tests/util/containers.go | 4 +- mantle/kola/tests/util/luks.go | 4 +- mantle/kola/tests/util/rpmostree.go | 8 +-- mantle/lang/destructor/destructor.go | 2 +- mantle/lang/maps/sorted.go | 4 +- mantle/lang/maps/sorted_test.go | 2 +- mantle/network/bufnet/pipe.go | 2 +- mantle/network/journal/_test/main.go | 2 +- mantle/network/journal/record.go | 2 +- mantle/network/journal/record_test.go | 2 +- mantle/network/mockssh/mockssh.go | 2 +- mantle/network/nsdialer.go | 2 +- mantle/network/ntp/_ntpd/ntpd.go | 4 +- mantle/network/ntp/server.go | 4 +- mantle/platform/api/aliyun/api.go | 8 +-- mantle/platform/api/aws/api.go | 4 +- mantle/platform/api/aws/ec2.go | 2 +- mantle/platform/api/aws/iam.go | 2 +- mantle/platform/api/aws/images.go | 2 +- mantle/platform/api/azure/api.go | 4 +- mantle/platform/api/azure/groups.go | 2 +- mantle/platform/api/azure/instance.go | 2 +- mantle/platform/api/azure/network.go | 2 +- mantle/platform/api/azure/options.go | 2 +- mantle/platform/api/do/api.go | 8 +-- mantle/platform/api/esx/api.go | 8 +-- mantle/platform/api/gcloud/api.go | 6 +-- mantle/platform/api/gcloud/compute.go | 2 +- mantle/platform/api/ibmcloud/api.go | 4 +- mantle/platform/api/openstack/api.go | 6 +-- mantle/platform/api/packet/api.go | 12 ++--- mantle/platform/cluster.go | 2 +- mantle/platform/conf/conf.go | 2 +- mantle/platform/conf/conf_test.go | 2 +- mantle/platform/flight.go | 2 +- mantle/platform/journal.go | 4 +- mantle/platform/local/cluster.go | 8 +-- mantle/platform/local/configdrive.go | 2 +- mantle/platform/local/dnsmasq.go | 6 +-- mantle/platform/local/flight.go | 10 ++-- mantle/platform/machine/aws/cluster.go | 4 +- mantle/platform/machine/aws/flight.go | 8 +-- mantle/platform/machine/aws/machine.go | 4 +- mantle/platform/machine/azure/cluster.go | 4 +- mantle/platform/machine/azure/flight.go | 8 +-- mantle/platform/machine/azure/machine.go | 4 +- mantle/platform/machine/do/cluster.go | 4 +- mantle/platform/machine/do/flight.go | 8 +-- mantle/platform/machine/do/machine.go | 2 +- mantle/platform/machine/esx/cluster.go | 4 +- mantle/platform/machine/esx/flight.go | 8 +-- mantle/platform/machine/esx/machine.go | 4 +- mantle/platform/machine/gcloud/cluster.go | 6 +-- mantle/platform/machine/gcloud/flight.go | 8 +-- mantle/platform/machine/gcloud/machine.go | 2 +- mantle/platform/machine/openstack/cluster.go | 4 +- mantle/platform/machine/openstack/flight.go | 8 +-- mantle/platform/machine/openstack/machine.go | 4 +- mantle/platform/machine/packet/cluster.go | 6 +-- mantle/platform/machine/packet/flight.go | 8 +-- mantle/platform/machine/packet/machine.go | 2 +- mantle/platform/machine/qemuiso/cluster.go | 6 +-- mantle/platform/machine/qemuiso/flight.go | 6 +-- mantle/platform/machine/qemuiso/machine.go | 2 +- mantle/platform/machine/unprivqemu/cluster.go | 6 +-- mantle/platform/machine/unprivqemu/flight.go | 6 +-- mantle/platform/machine/unprivqemu/machine.go | 2 +- mantle/platform/metal.go | 6 +-- mantle/platform/platform.go | 6 +-- mantle/platform/qemu.go | 8 +-- mantle/system/nproc.go | 2 +- mantle/system/ns/exec.go | 2 +- mantle/util/logio.go | 2 +- 170 files changed, 510 insertions(+), 510 deletions(-) diff --git a/docs/kola/adding-tests.md b/docs/kola/adding-tests.md index 3cefdae0..4853f4f7 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 1da3e3a1..c08b72e3 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 b45f11e5..85ce5fe8 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 29ecd742..eb8a1222 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 9073dd94..b3fff738 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 29309117..5b7d4532 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 e0dc1359..ace7d0ef 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 4434c778..56e38558 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 950dd3e1..43306882 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 26043f5e..97e504f7 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 0fb5b7d5..30f0430d 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 b6a569e3..47d05104 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 3d84166b..3d3e737f 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 18c91494..313085f7 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 5364222c..05fe51ef 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 9836a0af..a1de4783 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 8f575470..04409ae6 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 a56146c0..fa600b63 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 0eca2009..627a990c 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 cb40f0a1..3ae7e27f 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 5497bf08..88018092 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 e159fcea..5e065aee 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 7d89a37e..2013a5f6 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 b6c550d3..f8a616fd 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 35ad0b85..33a093e5 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 f09625a5..464ce0fd 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 32bd3efc..c402882f 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 897c0692..d5dcdd13 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 10a2279f..592db205 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 1adc926b..5b3cc9ba 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 b67ea8f1..a69ee0a7 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 e81446fc..34f6876d 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 d439fb20..09428dab 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 d1a79107..44a0fbe5 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 de80221f..624f6a84 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 b0989d45..f20ad604 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 d87998c1..27dbd85d 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 b3216a52..206ba9e2 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 a7c06b2a..8f816b60 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 d58d1290..93ea6af4 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 d6198e2a..af7124e6 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 fb3e869e..92286b4e 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 8cb72ce7..a8f30fbc 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 cb11dd3e..770c176e 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 51178cca..ed3b1c7b 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 ef8c95ec..2a76fcaa 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 f15116d2..c642768b 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 164d707e..74b46600 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 8bc8740e..24f79849 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 38feec17..878c2bdb 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 941b9ead..6247da98 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 a5433fc0..c4189461 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 07613e8b..23e97e72 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 458106b3..24f3bce0 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 46afa889..6d65d96b 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 cd21f0a0..63cb4f57 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 c1742e41..30b1e28f 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 cad16aab..86fa43e3 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 7117890e..e5bb9deb 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 f77dcc52..a9500d3b 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 e1587263..7b639279 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 e6847da9..a120d4ba 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 5251af70..31f79c3e 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 640c4532..b0eb7b83 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 649f09fe..175c76d1 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 85a93fcb..aee41846 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 16b711b8..841df713 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 8fc407de..29c72839 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 14e4dd2d..46527b5b 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 954d56f7..2c784a0e 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 dbf66800..24888f9a 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 17027286..cb95aff2 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 e964604a..178127cf 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 01b50f5c..096edf9a 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 e096b54d..d4f083d7 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 407591a5..58812714 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 62f07c1e..3b26c678 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 b53ecb3a..07077e03 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 0fa85d1e..fa8825a0 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 944ffb9a..de7719d1 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 0b867b44..7e70053a 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 737f9bc6..5cebca2d 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 cefae538..f8a5e3c1 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 92979436..5bfc9125 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 817ada47..738a50c2 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 87f18763..df523c70 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 8d62bfee..12e13316 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 9d567210..f9406bf8 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 f3206369..70cc34e2 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 3d3b13e1..5ee804c4 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 126239fb..3188abad 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 2c311c39..83cccada 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 e135675d..a390bde6 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 92afdbd2..c9230332 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 5aa7afe5..8316684c 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 667abb30..d9bde0b9 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 9a7800fe..b1849b6a 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 33251160..829a0974 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 a256930e..1c51eac9 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 e17ee4ba..35e66b67 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 5bf7e223..0a82a52c 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 fd9c2718..e60b5e1b 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 e6af0761..982e41c7 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 de453cf3..8a7e0b9c 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 3b3c4b7d..e7d8d05f 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 4800398c..3ea83c09 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 01ec4400..270a284d 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 bfb146be..e0eed483 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 584421b4..7df274b6 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 5a48c1ec..80ea543c 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 6e927e39..0c2a4c50 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 c01e2fd4..1b19d1b2 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 3d1e390f..1487e66d 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 234c5753..2d44aab5 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 a7e9a178..753d3311 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 0bc4bed2..c465ad44 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 2dd84c18..a098a49b 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 b346f997..f8c9b568 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 51886aaf..6042ef80 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 d71f2ca9..26dc6c08 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 c245161d..cc73229e 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 75a7a9eb..0ffc3a68 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 4b907502..9f379cd2 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 889d634c..3b210ad5 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 f2f1d680..88416501 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 dbcd51e5..d6aef2e5 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 a3f62981..e9ae1d00 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 9b587ee1..eeda7f21 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 ebdc3786..a3a72a7b 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 832a4fc2..05c30716 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 d74276d9..f8e099fd 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 6aeef5ba..6e91242f 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 8742edbd..589a83af 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 c3fd7102..a85bf9d1 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 1515a24f..ddc1f4d0 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 64f4d7bf..fc3ddf37 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 c0f4b280..93e1a4f2 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 700fe629..fd0f60ad 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 cdf6e2ab..a5f59188 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 929ceddc..0e6b3218 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 4dd74965..68eeda5b 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 62a801d2..9c1da068 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 a15574e9..d2c4a009 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 9fd79d5d..87d06569 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 5853da2d..70d1a1bb 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 493aa36a..b2b6fb3a 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 023586db..13478dbf 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 c6771220..1e496d85 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 ca1f5483..b168809e 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 ff0ab8be..fedee22c 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 f6da9ae2..75f3fbc1 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 54b89ae5..b6afae64 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 59fcf2ec..a2aced33 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 862f0c5e..59c0c59e 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 34043235..0bf05f1d 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 533faa57..9efca33d 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 fe73157e..da813e36 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 f9ab80ea..5317f373 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 e53c5fdd..a73eb3e9 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 62beae2c..9d293eb8 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 f6ff8f76..1a45afb0 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 af38a595..096c4a84 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 6e977329..68f44330 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 f794c536..c217bb0c 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 4ca4cf78..e758b4b4 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 767e21c2..e777317c 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 c467e257..135597aa 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 b4606387..35dc1fc5 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 12aec308..861ed41b 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 4aa69a28..798934a5 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) { -- Gitee