https://github.com/veertuinc/anka-cloud-gitlab-executor/pull/25/commits/76437d450369e0ed7b69c79dd4870cb0a3488648\#r1591477668

Author: NorseGaud

README.md

@@ -61,6 +61,7 @@ Accepted values for booleans are: "1", "t", "T", "true", "TRUE", "True", "0", "f
 | ANKA_CLOUD_BUILDS_DIR | ❌ | String | Absolute path to a directory where builds are stored in the VM. If not supplied, "/tmp/builds" is used. |
 | ANKA_CLOUD_CACHE_DIR | ❌ | String | Absolute path to a directory where build caches are stored in the VM. If not supplied, "/tmp/cache" is used. |
 | ANKA_SSH_CONNECTION_ATTEMPTS | ❌ | Number | The attempts to make when sshing to the VM. Useful when VMs take a long time to start under stressful situations or slow disks (like EBS). Defaults to `4` -- Minimum value of 1 |
+| ANKA_SSH_CONNECTION_ATTEMPT_DELAY | ❌ | Number | The delay between ssh connection attempts in seconds. Defaults to `5` |
 | ANKA_CLOUD_SSH_USER_NAME | ❌ | String | SSH user name to use inside VM. Defaults to "anka". This can also be set via a command line flags to prevent this value from being exposed to the job. See example below. |
 | ANKA_CLOUD_SSH_PASSWORD | ❌ | String | SSH password to use inside VM. Defaults to "admin". This can also be set via a command line flags to prevent this value from being exposed to the job. See example below. |
 

internal/command/run.go

@@ -106,13 +106,17 @@ func executeRun(ctx context.Context, env gitlab.Environment, args []string) erro
 	if maxAttempts < 1 {
 		maxAttempts = 4
 	}
+	sshConnectionAttemptDelay := env.SSHConnectionAttemptDelay
+	if sshConnectionAttemptDelay < 1 {
+		sshConnectionAttemptDelay = 5
+	}
 	for i := 0; i < maxAttempts; i++ {
 		log.Printf("attempt #%d to establish ssh connection to %q\n", i+1, addr)
 		sshClient, err = ssh.Dial("tcp", addr, sshClientConfig)
 		if err == nil {
 			break
 		}
-		time.Sleep(5 * time.Second)
+		time.Sleep(time.Duration(sshConnectionAttemptDelay) * time.Second)
 	}
 	if err != nil {
 		return fmt.Errorf("failed to create new ssh client connection to %q: %w", addr, err)

internal/gitlab/vars.go

@@ -18,57 +18,59 @@ const (
 
 var (
 	// Custom Executor vars
-	varDebug             = ankaVar("DEBUG")
-	varControllerURL     = ankaVar("CONTROLLER_URL")
-	varTemplateId        = ankaVar("TEMPLATE_ID")
-	varTemplateTag       = ankaVar("TEMPLATE_TAG")
-	varNodeId            = ankaVar("NODE_ID")
-	varPriority          = ankaVar("PRIORITY")
-	varNodeGroupId       = ankaVar("NODE_GROUP_ID")
-	varCaCertPath        = ankaVar("CA_CERT_PATH")
-	varSkipTLSVerify     = ankaVar("SKIP_TLS_VERIFY")
-	varClientCertPath    = ankaVar("CLIENT_CERT_PATH")
-	varClientCertKeyPath = ankaVar("CLIENT_CERT_KEY_PATH")
-	varSshUserName       = ankaVar("SSH_USER_NAME")
-	varSshPassword       = ankaVar("SSH_PASSWORD")
-	varSshAttempts       = ankaVar("SSH_CONNECTION_ATTEMPTS")
-	varCustomHTTPHeaders = ankaVar("CUSTOM_HTTP_HEADERS")
-	varKeepAliveOnError  = ankaVar("KEEP_ALIVE_ON_ERROR")
-	varTemplateName      = ankaVar("TEMPLATE_NAME")
-	varBuildsDir         = ankaVar("BUILDS_DIR")
-	varCacheDir          = ankaVar("CACHE_DIR")
-	varVmVramMb          = ankaVar("VM_VRAM_MB")
-	varVmVcpu            = ankaVar("VM_VCPU")
+	varDebug                     = ankaVar("DEBUG")
+	varControllerURL             = ankaVar("CONTROLLER_URL")
+	varTemplateId                = ankaVar("TEMPLATE_ID")
+	varTemplateTag               = ankaVar("TEMPLATE_TAG")
+	varNodeId                    = ankaVar("NODE_ID")
+	varPriority                  = ankaVar("PRIORITY")
+	varNodeGroupId               = ankaVar("NODE_GROUP_ID")
+	varCaCertPath                = ankaVar("CA_CERT_PATH")
+	varSkipTLSVerify             = ankaVar("SKIP_TLS_VERIFY")
+	varClientCertPath            = ankaVar("CLIENT_CERT_PATH")
+	varClientCertKeyPath         = ankaVar("CLIENT_CERT_KEY_PATH")
+	varSshUserName               = ankaVar("SSH_USER_NAME")
+	varSshPassword               = ankaVar("SSH_PASSWORD")
+	varSshAttempts               = ankaVar("SSH_CONNECTION_ATTEMPTS")
+	varSshConnectionAttemptDelay = ankaVar("SSH_CONNECTION_ATTEMPT_DELAY")
+	varCustomHTTPHeaders         = ankaVar("CUSTOM_HTTP_HEADERS")
+	varKeepAliveOnError          = ankaVar("KEEP_ALIVE_ON_ERROR")
+	varTemplateName              = ankaVar("TEMPLATE_NAME")
+	varBuildsDir                 = ankaVar("BUILDS_DIR")
+	varCacheDir                  = ankaVar("CACHE_DIR")
+	varVmVramMb                  = ankaVar("VM_VRAM_MB")
+	varVmVcpu                    = ankaVar("VM_VCPU")
 
 	// Gitlab vars
 	varGitlabJobId     = gitlabVar("CI_JOB_ID")
 	varGitlabJobStatus = gitlabVar("CI_JOB_STATUS")
 )
 
 type Environment struct {
-	ControllerURL     string
-	Debug             bool
-	TemplateId        string
-	TemplateTag       string
-	NodeId            string
-	Priority          int
-	NodeGroupId       string
-	CaCertPath        string
-	SkipTLSVerify     bool
-	ClientCertPath    string
-	ClientCertKeyPath string
-	SSHUserName       string
-	SSHPassword       string
-	SSHAttempts       int
-	GitlabJobId       string
-	CustomHttpHeaders map[string]string
-	KeepAliveOnError  bool
-	GitlabJobStatus   jobStatus
-	TemplateName      string
-	BuildsDir         string
-	CacheDir          string
-	VmVramMb          int
-	VmVcpu            int
+	ControllerURL             string
+	Debug                     bool
+	TemplateId                string
+	TemplateTag               string
+	NodeId                    string
+	Priority                  int
+	NodeGroupId               string
+	CaCertPath                string
+	SkipTLSVerify             bool
+	ClientCertPath            string
+	ClientCertKeyPath         string
+	SSHUserName               string
+	SSHPassword               string
+	SSHAttempts               int
+	SSHConnectionAttemptDelay int
+	GitlabJobId               string
+	CustomHttpHeaders         map[string]string
+	KeepAliveOnError          bool
+	GitlabJobStatus           jobStatus
+	TemplateName              string
+	BuildsDir                 string
+	CacheDir                  string
+	VmVramMb                  int
+	VmVcpu                    int
 }
 
 type jobStatus string
@@ -118,6 +120,13 @@ func InitEnv() (Environment, error) {
 		}
 		e.SSHAttempts = sshAttempts
 	}
+	if sshConnectionAttemptDelay, ok, err := GetIntEnvVar(varSshConnectionAttemptDelay); ok {
+		if err != nil {
+			return e, fmt.Errorf("%w %q: %w", ErrInvalidVar, varSshConnectionAttemptDelay, err)
+		}
+		e.SSHConnectionAttemptDelay = sshConnectionAttemptDelay
+	}
+
 	e.TemplateId = os.Getenv(varTemplateId)
 	e.TemplateName = os.Getenv(varTemplateName)
 	e.TemplateTag = os.Getenv(varTemplateTag)