From 86bbfdf3e9675e1e9967c00512f1e9865961b581 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Tue, 29 Aug 2017 13:00:40 +0200
Subject: [PATCH] Rename 2nd iteration: rename imports
---
apps/gitlab-runner-helper/main.go | 8 +++---
commands/builds_helper.go | 2 +-
commands/builds_helper_test.go | 2 +-
commands/config.go | 4 +--
commands/config_test.go | 2 +-
commands/config_unix.go | 2 +-
commands/config_windows.go | 2 +-
commands/exec.go | 14 +++++-----
commands/health_helper.go | 2 +-
commands/helpers/artifacts_downloader.go | 8 +++---
commands/helpers/artifacts_downloader_test.go | 4 +--
commands/helpers/artifacts_test.go | 2 +-
commands/helpers/artifacts_uploader.go | 8 +++---
commands/helpers/artifacts_uploader_test.go | 4 +--
commands/helpers/cache_archiver.go | 6 ++---
commands/helpers/cache_archiver_test.go | 2 +-
commands/helpers/cache_client.go | 2 +-
commands/helpers/cache_extractor.go | 8 +++---
commands/helpers/cache_extractor_test.go | 2 +-
commands/list.go | 2 +-
commands/multi.go | 14 +++++-----
commands/register.go | 6 ++---
commands/service.go | 6 ++---
commands/single.go | 4 +--
commands/single_test.go | 2 +-
commands/unregister.go | 4 +--
commands/verify.go | 4 +--
common/build.go | 2 +-
common/build_logger.go | 2 +-
common/config.go | 8 +++---
common/network.go | 2 +-
common/shell.go | 2 +-
executors/default_executor_provider.go | 2 +-
executors/docker/executor_docker.go | 8 +++---
executors/docker/executor_docker_command.go | 4 +--
.../docker/executor_docker_command_test.go | 8 +++---
executors/docker/executor_docker_ssh.go | 6 ++---
executors/docker/executor_docker_test.go | 6 ++---
executors/docker/machine/collector_test.go | 2 +-
executors/docker/machine/details.go | 2 +-
executors/docker/machine/details_test.go | 2 +-
executors/docker/machine/executor.go | 4 +--
executors/docker/machine/executor_test.go | 4 +--
executors/docker/machine/name.go | 2 +-
executors/docker/machine/name_test.go | 2 +-
executors/docker/machine/provider.go | 4 +--
executors/docker/machine/provider_test.go | 4 +--
executors/executor_abstract.go | 2 +-
executors/executor_init.go | 2 +-
executors/kubernetes/executor_kubernetes.go | 4 +--
.../kubernetes/executor_kubernetes_test.go | 6 ++---
executors/kubernetes/util.go | 2 +-
executors/kubernetes/util_test.go | 2 +-
executors/parallels/executor_parallels.go | 8 +++---
.../parallels/executor_parallels_test.go | 6 ++---
executors/shell/executor_shell.go | 6 ++---
executors/shell/executor_shell_test.go | 4 +--
executors/ssh/executor_ssh.go | 6 ++---
executors/virtualbox/executor_virtualbox.go | 8 +++---
.../virtualbox/executor_virtualbox_test.go | 6 ++---
helpers/cli/runtime_platform.go | 2 +-
helpers/formatter/runner_text_formatter.go | 2 +-
helpers/gitlab_ci_yaml_parser/data_bag.go | 2 +-
helpers/gitlab_ci_yaml_parser/parser.go | 2 +-
helpers/gitlab_ci_yaml_parser/parser_test.go | 2 +-
helpers/sentry/log_hook.go | 2 +-
helpers/service/simple_test.go | 2 +-
helpers/ssh/ssh_command.go | 2 +-
main.go | 26 +++++++++----------
network/client.go | 2 +-
network/client_test.go | 2 +-
network/gitlab.go | 4 +--
network/gitlab_test.go | 2 +-
network/trace.go | 4 +--
network/trace_test.go | 2 +-
shells/abstract.go | 2 +-
shells/bash.go | 4 +--
shells/cache.go | 2 +-
shells/cache_test.go | 2 +-
shells/cmd.go | 4 +--
shells/powershell.go | 4 +--
shells/shell_writer.go | 2 +-
shells/shell_writer_test.go | 2 +-
83 files changed, 172 insertions(+), 172 deletions(-)
diff --git a/apps/gitlab-runner-helper/main.go b/apps/gitlab-runner-helper/main.go
index 9615d6f59..d9380879f 100644
--- a/apps/gitlab-runner-helper/main.go
+++ b/apps/gitlab-runner-helper/main.go
@@ -6,11 +6,11 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/commands/helpers"
+ _ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers"
)
func main() {
diff --git a/commands/builds_helper.go b/commands/builds_helper.go
index d1fbfea88..cc7a89322 100644
--- a/commands/builds_helper.go
+++ b/commands/builds_helper.go
@@ -6,7 +6,7 @@ import (
"strings"
"sync"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
"github.com/prometheus/client_golang/prometheus"
)
diff --git a/commands/builds_helper_test.go b/commands/builds_helper_test.go
index 1251fac1d..b2cb86ac6 100644
--- a/commands/builds_helper_test.go
+++ b/commands/builds_helper_test.go
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
func TestBuildsHelperCollect(t *testing.T) {
diff --git a/commands/config.go b/commands/config.go
index 78ce5c021..3a03ffb0d 100644
--- a/commands/config.go
+++ b/commands/config.go
@@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
func getDefaultConfigFile() string {
diff --git a/commands/config_test.go b/commands/config_test.go
index 06eab9b3c..d0d78c935 100644
--- a/commands/config_test.go
+++ b/commands/config_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type metricsServerTestExample struct {
diff --git a/commands/config_unix.go b/commands/config_unix.go
index 173785ed9..4221803ef 100644
--- a/commands/config_unix.go
+++ b/commands/config_unix.go
@@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
func getDefaultConfigDirectory() string {
diff --git a/commands/config_windows.go b/commands/config_windows.go
index 964cfdb76..d8959ae89 100644
--- a/commands/config_windows.go
+++ b/commands/config_windows.go
@@ -1,7 +1,7 @@
package commands
import (
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
func getDefaultConfigDirectory() string {
diff --git a/commands/exec.go b/commands/exec.go
index 77d4202c9..71651d8af 100644
--- a/commands/exec.go
+++ b/commands/exec.go
@@ -8,15 +8,15 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/ayufan/golang-cli-helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/gitlab_ci_yaml_parser"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/gitlab_ci_yaml_parser"
// Force to load all executors, executes init() on them
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/parallels"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/shell"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/ssh"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/virtualbox"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/shell"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox"
)
type ExecCommand struct {
diff --git a/commands/health_helper.go b/commands/health_helper.go
index a4eb2ba59..35de9f4c7 100644
--- a/commands/health_helper.go
+++ b/commands/health_helper.go
@@ -5,7 +5,7 @@ import (
"time"
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type healthData struct {
diff --git a/commands/helpers/artifacts_downloader.go b/commands/helpers/artifacts_downloader.go
index eaf30e0a4..24a13714a 100644
--- a/commands/helpers/artifacts_downloader.go
+++ b/commands/helpers/artifacts_downloader.go
@@ -8,10 +8,10 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type ArtifactsDownloaderCommand struct {
diff --git a/commands/helpers/artifacts_downloader_test.go b/commands/helpers/artifacts_downloader_test.go
index d13e14985..297613403 100644
--- a/commands/helpers/artifacts_downloader_test.go
+++ b/commands/helpers/artifacts_downloader_test.go
@@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
"os"
)
diff --git a/commands/helpers/artifacts_test.go b/commands/helpers/artifacts_test.go
index ff6b163b6..6d6e70550 100644
--- a/commands/helpers/artifacts_test.go
+++ b/commands/helpers/artifacts_test.go
@@ -8,7 +8,7 @@ import (
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
const artifactsTestArchivedFile = "archive_file"
diff --git a/commands/helpers/artifacts_uploader.go b/commands/helpers/artifacts_uploader.go
index 1e39e34e2..24640eb9d 100644
--- a/commands/helpers/artifacts_uploader.go
+++ b/commands/helpers/artifacts_uploader.go
@@ -10,10 +10,10 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type ArtifactsUploaderCommand struct {
diff --git a/commands/helpers/artifacts_uploader_test.go b/commands/helpers/artifacts_uploader_test.go
index 43541bb4f..dc8ae571c 100644
--- a/commands/helpers/artifacts_uploader_test.go
+++ b/commands/helpers/artifacts_uploader_test.go
@@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
"io/ioutil"
)
diff --git a/commands/helpers/cache_archiver.go b/commands/helpers/cache_archiver.go
index c025c2be0..4b38c0fea 100644
--- a/commands/helpers/cache_archiver.go
+++ b/commands/helpers/cache_archiver.go
@@ -10,9 +10,9 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/url"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/url"
)
type CacheArchiverCommand struct {
diff --git a/commands/helpers/cache_archiver_test.go b/commands/helpers/cache_archiver_test.go
index d3b215018..259f3fb5b 100644
--- a/commands/helpers/cache_archiver_test.go
+++ b/commands/helpers/cache_archiver_test.go
@@ -12,7 +12,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
const cacheArchiverArchive = "archive.zip"
diff --git a/commands/helpers/cache_client.go b/commands/helpers/cache_client.go
index 0404b55f6..a2c196675 100644
--- a/commands/helpers/cache_client.go
+++ b/commands/helpers/cache_client.go
@@ -5,7 +5,7 @@ import (
"net/http"
"time"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type CacheClient struct {
diff --git a/commands/helpers/cache_extractor.go b/commands/helpers/cache_extractor.go
index 1e1eaf521..eb7d50bbc 100644
--- a/commands/helpers/cache_extractor.go
+++ b/commands/helpers/cache_extractor.go
@@ -12,10 +12,10 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/url"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/url"
)
type CacheExtractorCommand struct {
diff --git a/commands/helpers/cache_extractor_test.go b/commands/helpers/cache_extractor_test.go
index 2c0cf24f5..a9f676899 100644
--- a/commands/helpers/cache_extractor_test.go
+++ b/commands/helpers/cache_extractor_test.go
@@ -13,7 +13,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
const cacheExtractorArchive = "archive.zip"
diff --git a/commands/list.go b/commands/list.go
index dd657bfdc..e207792fc 100644
--- a/commands/list.go
+++ b/commands/list.go
@@ -3,7 +3,7 @@ package commands
import (
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type ListCommand struct {
diff --git a/commands/multi.go b/commands/multi.go
index bb4f481b4..045500b48 100644
--- a/commands/multi.go
+++ b/commands/multi.go
@@ -19,13 +19,13 @@ import (
log "github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/cli"
- prometheus_helper "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/prometheus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/sentry"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/service"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+ prometheus_helper "gitlab.com/gitlab-org/gitlab-runner/helpers/prometheus"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/sentry"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/service"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type RunCommand struct {
diff --git a/commands/register.go b/commands/register.go
index e9cbb57f6..067ed5f07 100644
--- a/commands/register.go
+++ b/commands/register.go
@@ -10,9 +10,9 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type RegisterCommand struct {
diff --git a/commands/service.go b/commands/service.go
index 760fbd77f..e23e8ce3f 100644
--- a/commands/service.go
+++ b/commands/service.go
@@ -8,9 +8,9 @@ import (
"github.com/Sirupsen/logrus"
"github.com/ayufan/golang-kardianos-service"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/service"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/service"
)
const (
diff --git a/commands/single.go b/commands/single.go
index 842d9da41..f1ab85e11 100644
--- a/commands/single.go
+++ b/commands/single.go
@@ -10,8 +10,8 @@ import (
"github.com/tevino/abool"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type RunSingleCommand struct {
diff --git a/commands/single_test.go b/commands/single_test.go
index 5c96a0af1..d606fb8b2 100644
--- a/commands/single_test.go
+++ b/commands/single_test.go
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
func init() {
diff --git a/commands/unregister.go b/commands/unregister.go
index 17af5b463..a3d160706 100644
--- a/commands/unregister.go
+++ b/commands/unregister.go
@@ -4,8 +4,8 @@ import (
"github.com/urfave/cli"
log "github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type UnregisterCommand struct {
diff --git a/commands/verify.go b/commands/verify.go
index 2a0b7d890..66d4e9b0e 100644
--- a/commands/verify.go
+++ b/commands/verify.go
@@ -6,8 +6,8 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/network"
)
type VerifyCommand struct {
diff --git a/common/build.go b/common/build.go
index 762f08265..e2fab124b 100644
--- a/common/build.go
+++ b/common/build.go
@@ -13,7 +13,7 @@ import (
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type GitStrategy int
diff --git a/common/build_logger.go b/common/build_logger.go
index e175609a6..b08797c7f 100644
--- a/common/build_logger.go
+++ b/common/build_logger.go
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type BuildLogger struct {
diff --git a/common/config.go b/common/config.go
index c603dd36e..640d634e8 100644
--- a/common/config.go
+++ b/common/config.go
@@ -15,10 +15,10 @@ import (
"github.com/BurntSushi/toml"
log "github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/timeperiod"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/timeperiod"
)
type DockerPullPolicy string
diff --git a/common/network.go b/common/network.go
index 6606ef1d8..4bfb6c4d3 100644
--- a/common/network.go
+++ b/common/network.go
@@ -5,7 +5,7 @@ import (
"fmt"
"io"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/url"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/url"
)
type UpdateState int
diff --git a/common/shell.go b/common/shell.go
index 4506b08ce..a16232f10 100644
--- a/common/shell.go
+++ b/common/shell.go
@@ -3,7 +3,7 @@ package common
import (
"fmt"
log "github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type ShellConfiguration struct {
diff --git a/executors/default_executor_provider.go b/executors/default_executor_provider.go
index 692a8d054..716810bb4 100644
--- a/executors/default_executor_provider.go
+++ b/executors/default_executor_provider.go
@@ -1,6 +1,6 @@
package executors
-import "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+import "gitlab.com/gitlab-org/gitlab-runner/common"
type DefaultExecutorProvider struct {
Creator func() common.Executor
diff --git a/executors/docker/executor_docker.go b/executors/docker/executor_docker.go
index 87b05b9fa..671d568ce 100644
--- a/executors/docker/executor_docker.go
+++ b/executors/docker/executor_docker.go
@@ -20,10 +20,10 @@ import (
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/stdcopy"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- docker_helpers "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ docker_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
"golang.org/x/net/context"
)
diff --git a/executors/docker/executor_docker_command.go b/executors/docker/executor_docker_command.go
index 7d387b07b..b0d9c8612 100644
--- a/executors/docker/executor_docker_command.go
+++ b/executors/docker/executor_docker_command.go
@@ -5,8 +5,8 @@ import (
"errors"
"github.com/docker/docker/api/types"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
)
type commandExecutor struct {
diff --git a/executors/docker/executor_docker_command_test.go b/executors/docker/executor_docker_command_test.go
index 365ad3673..9329daf14 100644
--- a/executors/docker/executor_docker_command_test.go
+++ b/executors/docker/executor_docker_command_test.go
@@ -15,10 +15,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
"golang.org/x/net/context"
)
diff --git a/executors/docker/executor_docker_ssh.go b/executors/docker/executor_docker_ssh.go
index 6c169df2d..6a228d8c0 100644
--- a/executors/docker/executor_docker_ssh.go
+++ b/executors/docker/executor_docker_ssh.go
@@ -5,9 +5,9 @@ import (
"github.com/docker/docker/api/types"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
)
type sshExecutor struct {
diff --git a/executors/docker/executor_docker_test.go b/executors/docker/executor_docker_test.go
index 009150818..bf96f8843 100644
--- a/executors/docker/executor_docker_test.go
+++ b/executors/docker/executor_docker_test.go
@@ -18,9 +18,9 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
"golang.org/x/net/context"
)
diff --git a/executors/docker/machine/collector_test.go b/executors/docker/machine/collector_test.go
index c6391bce7..f579517c7 100644
--- a/executors/docker/machine/collector_test.go
+++ b/executors/docker/machine/collector_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"time"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
"github.com/prometheus/client_golang/prometheus"
"github.com/stretchr/testify/assert"
diff --git a/executors/docker/machine/details.go b/executors/docker/machine/details.go
index b1b0e64b3..b757ae64c 100644
--- a/executors/docker/machine/details.go
+++ b/executors/docker/machine/details.go
@@ -7,7 +7,7 @@ import (
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type machineDetails struct {
diff --git a/executors/docker/machine/details_test.go b/executors/docker/machine/details_test.go
index 298615b33..add8a0e65 100644
--- a/executors/docker/machine/details_test.go
+++ b/executors/docker/machine/details_test.go
@@ -2,7 +2,7 @@ package machine
import (
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
"testing"
)
diff --git a/executors/docker/machine/executor.go b/executors/docker/machine/executor.go
index 733bb58a4..35b932e31 100644
--- a/executors/docker/machine/executor.go
+++ b/executors/docker/machine/executor.go
@@ -6,10 +6,10 @@ import (
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
// Force to load docker executor
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
)
const (
diff --git a/executors/docker/machine/executor_test.go b/executors/docker/machine/executor_test.go
index 6e009b21b..47bb9a20d 100644
--- a/executors/docker/machine/executor_test.go
+++ b/executors/docker/machine/executor_test.go
@@ -6,8 +6,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
)
func getRunnerConfig() *common.RunnerConfig {
diff --git a/executors/docker/machine/name.go b/executors/docker/machine/name.go
index 383454ef9..6f748b77c 100644
--- a/executors/docker/machine/name.go
+++ b/executors/docker/machine/name.go
@@ -6,7 +6,7 @@ import (
"strings"
"time"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
func machineFormat(runner string, template string) string {
diff --git a/executors/docker/machine/name_test.go b/executors/docker/machine/name_test.go
index d4967d748..e002307a1 100644
--- a/executors/docker/machine/name_test.go
+++ b/executors/docker/machine/name_test.go
@@ -2,7 +2,7 @@ package machine
import (
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
"testing"
)
diff --git a/executors/docker/machine/provider.go b/executors/docker/machine/provider.go
index ec2bb4c59..852796218 100644
--- a/executors/docker/machine/provider.go
+++ b/executors/docker/machine/provider.go
@@ -9,8 +9,8 @@ import (
"github.com/Sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
)
type machineProvider struct {
diff --git a/executors/docker/machine/provider_test.go b/executors/docker/machine/provider_test.go
index 3773dc592..42bcd7144 100644
--- a/executors/docker/machine/provider_test.go
+++ b/executors/docker/machine/provider_test.go
@@ -8,8 +8,8 @@ import (
"time"
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
)
var machineDefaultConfig = &common.RunnerConfig{
diff --git a/executors/executor_abstract.go b/executors/executor_abstract.go
index c6eeacf9f..c8d8578b2 100644
--- a/executors/executor_abstract.go
+++ b/executors/executor_abstract.go
@@ -4,7 +4,7 @@ import (
"context"
"os"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type ExecutorOptions struct {
diff --git a/executors/executor_init.go b/executors/executor_init.go
index 5bff067d4..46e4f0d5b 100644
--- a/executors/executor_init.go
+++ b/executors/executor_init.go
@@ -6,5 +6,5 @@ import (
// from external packages between 1.4.x and 1.5.x
// this import forces to load shells before
// and fixes: panic: no shells defined
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells"
+ _ "gitlab.com/gitlab-org/gitlab-runner/shells"
)
diff --git a/executors/kubernetes/executor_kubernetes.go b/executors/kubernetes/executor_kubernetes.go
index e021ccfa4..783f3360a 100644
--- a/executors/kubernetes/executor_kubernetes.go
+++ b/executors/kubernetes/executor_kubernetes.go
@@ -11,8 +11,8 @@ import (
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/credentialprovider"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
)
var (
diff --git a/executors/kubernetes/executor_kubernetes_test.go b/executors/kubernetes/executor_kubernetes_test.go
index 6d7a89dee..46b3295ae 100644
--- a/executors/kubernetes/executor_kubernetes_test.go
+++ b/executors/kubernetes/executor_kubernetes_test.go
@@ -26,9 +26,9 @@ import (
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/fake"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
var (
diff --git a/executors/kubernetes/util.go b/executors/kubernetes/util.go
index b8329efdc..c56eb098a 100644
--- a/executors/kubernetes/util.go
+++ b/executors/kubernetes/util.go
@@ -15,7 +15,7 @@ import (
clientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
func init() {
diff --git a/executors/kubernetes/util_test.go b/executors/kubernetes/util_test.go
index 1099755ef..5c30ed889 100644
--- a/executors/kubernetes/util_test.go
+++ b/executors/kubernetes/util_test.go
@@ -15,7 +15,7 @@ import (
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/fake"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
func TestGetKubeClientConfig(t *testing.T) {
diff --git a/executors/parallels/executor_parallels.go b/executors/parallels/executor_parallels.go
index eb522215e..2b0c0520f 100644
--- a/executors/parallels/executor_parallels.go
+++ b/executors/parallels/executor_parallels.go
@@ -6,11 +6,11 @@ import (
"os/exec"
"time"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
- prl "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/parallels"
+ prl "gitlab.com/gitlab-org/gitlab-runner/helpers/parallels"
)
type executor struct {
diff --git a/executors/parallels/executor_parallels_test.go b/executors/parallels/executor_parallels_test.go
index f927cb421..b7a2063d7 100644
--- a/executors/parallels/executor_parallels_test.go
+++ b/executors/parallels/executor_parallels_test.go
@@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
)
const prlImage = "ubuntu-runner"
diff --git a/executors/shell/executor_shell.go b/executors/shell/executor_shell.go
index 716f49e11..d96a5c76a 100644
--- a/executors/shell/executor_shell.go
+++ b/executors/shell/executor_shell.go
@@ -11,9 +11,9 @@ import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/kardianos/osext"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
"time"
)
diff --git a/executors/shell/executor_shell_test.go b/executors/shell/executor_shell_test.go
index cb4eeaf2d..33b7cd157 100644
--- a/executors/shell/executor_shell_test.go
+++ b/executors/shell/executor_shell_test.go
@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
func onEachShell(t *testing.T, f func(t *testing.T, shell string)) {
diff --git a/executors/ssh/executor_ssh.go b/executors/ssh/executor_ssh.go
index 0864f0b24..df80d40c2 100644
--- a/executors/ssh/executor_ssh.go
+++ b/executors/ssh/executor_ssh.go
@@ -3,9 +3,9 @@ package ssh
import (
"errors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
)
type executor struct {
diff --git a/executors/virtualbox/executor_virtualbox.go b/executors/virtualbox/executor_virtualbox.go
index ad671f4a3..49de53736 100644
--- a/executors/virtualbox/executor_virtualbox.go
+++ b/executors/virtualbox/executor_virtualbox.go
@@ -3,10 +3,10 @@ package virtualbox
import (
"errors"
"fmt"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
- vbox "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/virtualbox"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/executors"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
+ vbox "gitlab.com/gitlab-org/gitlab-runner/helpers/virtualbox"
"time"
)
diff --git a/executors/virtualbox/executor_virtualbox_test.go b/executors/virtualbox/executor_virtualbox_test.go
index 89dc18725..38c1b3972 100644
--- a/executors/virtualbox/executor_virtualbox_test.go
+++ b/executors/virtualbox/executor_virtualbox_test.go
@@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
)
const vboxImage = "ubuntu-runner"
diff --git a/helpers/cli/runtime_platform.go b/helpers/cli/runtime_platform.go
index 2cee32596..9b62520e8 100644
--- a/helpers/cli/runtime_platform.go
+++ b/helpers/cli/runtime_platform.go
@@ -3,7 +3,7 @@ package cli_helpers
import (
"runtime"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
diff --git a/helpers/formatter/runner_text_formatter.go b/helpers/formatter/runner_text_formatter.go
index 01595419e..57b93e3c9 100644
--- a/helpers/formatter/runner_text_formatter.go
+++ b/helpers/formatter/runner_text_formatter.go
@@ -6,7 +6,7 @@ import (
"sort"
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type RunnerTextFormatter struct {
diff --git a/helpers/gitlab_ci_yaml_parser/data_bag.go b/helpers/gitlab_ci_yaml_parser/data_bag.go
index af46fc9f2..892ce586e 100644
--- a/helpers/gitlab_ci_yaml_parser/data_bag.go
+++ b/helpers/gitlab_ci_yaml_parser/data_bag.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type DataBag map[string]interface{}
diff --git a/helpers/gitlab_ci_yaml_parser/parser.go b/helpers/gitlab_ci_yaml_parser/parser.go
index 9b1744af7..ea329156f 100644
--- a/helpers/gitlab_ci_yaml_parser/parser.go
+++ b/helpers/gitlab_ci_yaml_parser/parser.go
@@ -7,7 +7,7 @@ import (
"strconv"
"strings"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
"gopkg.in/yaml.v2"
)
diff --git a/helpers/gitlab_ci_yaml_parser/parser_test.go b/helpers/gitlab_ci_yaml_parser/parser_test.go
index d128df3c6..6a56bf2af 100644
--- a/helpers/gitlab_ci_yaml_parser/parser_test.go
+++ b/helpers/gitlab_ci_yaml_parser/parser_test.go
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
var testFile1 = `
diff --git a/helpers/sentry/log_hook.go b/helpers/sentry/log_hook.go
index 1b4c39e91..dd2ab8fe0 100644
--- a/helpers/sentry/log_hook.go
+++ b/helpers/sentry/log_hook.go
@@ -9,7 +9,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/getsentry/raven-go"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type LogHook struct {
diff --git a/helpers/service/simple_test.go b/helpers/service/simple_test.go
index b11fd6cad..3791d84a1 100644
--- a/helpers/service/simple_test.go
+++ b/helpers/service/simple_test.go
@@ -7,7 +7,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/service/mocks"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/service/mocks"
)
var errExample = errors.New("example error")
diff --git a/helpers/ssh/ssh_command.go b/helpers/ssh/ssh_command.go
index 46c7448ac..6919fd49e 100644
--- a/helpers/ssh/ssh_command.go
+++ b/helpers/ssh/ssh_command.go
@@ -11,7 +11,7 @@ import (
"golang.org/x/crypto/ssh"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type Client struct {
diff --git a/main.go b/main.go
index a50e2a6c9..0bd767b7e 100644
--- a/main.go
+++ b/main.go
@@ -6,20 +6,20 @@ import (
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/cli"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/commands"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/commands/helpers"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/machine"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/kubernetes"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/parallels"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/shell"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/ssh"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/virtualbox"
- _ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells"
+ _ "gitlab.com/gitlab-org/gitlab-runner/commands"
+ _ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker/machine"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/kubernetes"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/shell"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh"
+ _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox"
+ _ "gitlab.com/gitlab-org/gitlab-runner/shells"
)
func main() {
diff --git a/network/client.go b/network/client.go
index 76afaaa7b..e4f754ea2 100644
--- a/network/client.go
+++ b/network/client.go
@@ -24,7 +24,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/jpillora/backoff"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type requestCredentials interface {
diff --git a/network/client_test.go b/network/client_test.go
index 259726cca..a2dcd29e7 100644
--- a/network/client_test.go
+++ b/network/client_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- . "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ . "gitlab.com/gitlab-org/gitlab-runner/common"
)
func clientHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/network/gitlab.go b/network/gitlab.go
index ba2a4bed3..4c4b4ca37 100644
--- a/network/gitlab.go
+++ b/network/gitlab.go
@@ -15,8 +15,8 @@ import (
"sync"
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
const clientError = -100
diff --git a/network/gitlab_test.go b/network/gitlab_test.go
index 6aa5d0a8f..da217cb7a 100644
--- a/network/gitlab_test.go
+++ b/network/gitlab_test.go
@@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- . "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ . "gitlab.com/gitlab-org/gitlab-runner/common"
)
var brokenCredentials = RunnerCredentials{
diff --git a/network/trace.go b/network/trace.go
index d5d7cf1a5..f2a502437 100644
--- a/network/trace.go
+++ b/network/trace.go
@@ -10,8 +10,8 @@ import (
"sync"
"time"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
var traceUpdateInterval = common.UpdateInterval
diff --git a/network/trace_test.go b/network/trace_test.go
index b08d3aa56..756e8ae41 100644
--- a/network/trace_test.go
+++ b/network/trace_test.go
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
const successID = 4
diff --git a/shells/abstract.go b/shells/abstract.go
index d079540b1..fda74b470 100644
--- a/shells/abstract.go
+++ b/shells/abstract.go
@@ -8,7 +8,7 @@ import (
"strconv"
"strings"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type AbstractShell struct {
diff --git a/shells/bash.go b/shells/bash.go
index baf1e14da..91b2b9f91 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -4,8 +4,8 @@ import (
"bufio"
"bytes"
"fmt"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
"io"
"path"
"runtime"
diff --git a/shells/cache.go b/shells/cache.go
index 08d503184..37abff745 100644
--- a/shells/cache.go
+++ b/shells/cache.go
@@ -13,7 +13,7 @@ import (
"github.com/minio/minio-go"
"github.com/Sirupsen/logrus"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
type bucketLocationTripper struct {
diff --git a/shells/cache_test.go b/shells/cache_test.go
index 9f3f004be..575ab1cd7 100644
--- a/shells/cache_test.go
+++ b/shells/cache_test.go
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
)
func defaultS3CacheFactory() *common.CacheConfig {
diff --git a/shells/cmd.go b/shells/cmd.go
index 36178e078..af1f3572a 100644
--- a/shells/cmd.go
+++ b/shells/cmd.go
@@ -10,8 +10,8 @@ import (
"runtime"
"strings"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type CmdShell struct {
diff --git a/shells/powershell.go b/shells/powershell.go
index 6d44902a1..aa3e67edb 100644
--- a/shells/powershell.go
+++ b/shells/powershell.go
@@ -9,8 +9,8 @@ import (
"path/filepath"
"strings"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/common"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type PowerShell struct {
diff --git a/shells/shell_writer.go b/shells/shell_writer.go
index 9df9ae0d2..cec7c29b6 100644
--- a/shells/shell_writer.go
+++ b/shells/shell_writer.go
@@ -1,6 +1,6 @@
package shells
-import "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+import "gitlab.com/gitlab-org/gitlab-runner/common"
type ShellWriter interface {
Variable(variable common.JobVariable)
diff --git a/shells/shell_writer_test.go b/shells/shell_writer_test.go
index cb3a973c1..24a22e822 100644
--- a/shells/shell_writer_test.go
+++ b/shells/shell_writer_test.go
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-runner/helpers"
)
type TestShellWriter interface {
--
GitLab