diff --git a/src/com/mirantis/mcp/MCPArtifactory.groovy b/src/com/mirantis/mcp/MCPArtifactory.groovy index c9556f09..177737af 100644 --- a/src/com/mirantis/mcp/MCPArtifactory.groovy +++ b/src/com/mirantis/mcp/MCPArtifactory.groovy @@ -85,7 +85,7 @@ def uriByProperties(String artifactoryURL, LinkedHashMap properties, Boolean onl * * @param artifactUrl String, an URL to artifact in Artifactory repo * @param properties LinkedHashMap, a Hash of properties (key-value) which - * should be assigned for choosen artifact + * should be assigned for chosen artifact * @param recursive Boolean, if artifact_url is a directory, whether to set * properties recursively or not */ diff --git a/src/com/mirantis/mk/Common.groovy b/src/com/mirantis/mk/Common.groovy index 031bf6f3..e14f96c9 100644 --- a/src/com/mirantis/mk/Common.groovy +++ b/src/com/mirantis/mk/Common.groovy @@ -457,7 +457,7 @@ def cutOrDie(cmd, index) { /** * Check variable contains keyword - * @param variable keywork is searched (contains) here + * @param variable keyword is searched (contains) here * @param keyword string to look for * @return True if variable contains keyword (case insensitive), False if do not contains or any of input isn't a string */ @@ -797,7 +797,7 @@ def comparePillars(compRoot, b_url, grepOpts) { /** * Simple function, to get basename from string. * line - path-string - * remove_ext - string, optionl. Drop file extenstion. + * remove_ext - string, optionl. Drop file extension. **/ def GetBaseName(line, remove_ext) { filename = line.toString().split('/').last() diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy index 6e743790..a55c6921 100644 --- a/src/com/mirantis/mk/Debian.groovy +++ b/src/com/mirantis/mk/Debian.groovy @@ -258,7 +258,7 @@ def uploadPpa(ppaRepo, dirPath, privateKeyCredId) { * @param env Salt Connection object or env Salt command map * @param target Salt target to upgrade packages on. * @param timeout Sleep timeout when doing retries. -* @param attempts Number of attemps to wait for. +* @param attempts Number of attempts to wait for. */ def osReboot(env, target, timeout=30, attempts=10) { def salt = new com.mirantis.mk.Salt() @@ -282,7 +282,7 @@ def osReboot(env, target, timeout=30, attempts=10) { * @param mode 'upgrade' or 'dist-upgrade' * @param postponeReboot Boolean flag to specify if reboot have to be postponed. * @param timeout Sleep timeout when doing retries. -* @param attempts Number of attemps to wait for. +* @param attempts Number of attempts to wait for. */ def osUpgradeNode(env, target, mode, postponeReboot=false, timeout=30, attempts=10, batch=null) { if(mode in ['upgrade', 'dist-upgrade']) { diff --git a/src/com/mirantis/mk/Galera.groovy b/src/com/mirantis/mk/Galera.groovy index 3b6f6269..fb056e0e 100644 --- a/src/com/mirantis/mk/Galera.groovy +++ b/src/com/mirantis/mk/Galera.groovy @@ -110,7 +110,7 @@ def verifyGaleraStatus(env, checkTimeSync=false) { } common.infoMsg("Disk i/o utilization was checked and everything seems to be in order.") if (checkTimeSync && !salt.checkClusterTimeSync(env, "I@galera:master or I@galera:slave")) { - common.errorMsg("Time in cluster is desynchronized or it couldn't be detemined. You should fix this issue manually before proceeding.") + common.errorMsg("Time in cluster is desynchronized or it couldn't be determined. You should fix this issue manually before proceeding.") mysqlStatusReport['error'] = 131 return mysqlStatusReport } @@ -163,7 +163,7 @@ def verifyGaleraStatus(env, checkTimeSync=false) { common.infoMsg("No errors found - MySQL status is ${status}.") return mysqlStatusReport } else if (status == "unknown") { - common.warningMsg('MySQL status cannot be detemined') + common.warningMsg('MySQL status cannot be determined') mysqlStatusReport['error'] = 1 return mysqlStatusReport } else { @@ -176,7 +176,7 @@ def verifyGaleraStatus(env, checkTimeSync=false) { /** Validates and prints result of verifyGaleraStatus function @param env Salt Connection object or pepperEnv @param out Output of the mysql.status Salt function -@return status "OK", "ERROR" or "uknown" depending on result of validation +@return status "OK", "ERROR" or "unknown" depending on result of validation */ def validateAndPrintGaleraStatusReport(env, out, minion, nodeRoleMaster=false) { diff --git a/src/com/mirantis/mk/Gerrit.groovy b/src/com/mirantis/mk/Gerrit.groovy index c33dc5e9..fd058e54 100644 --- a/src/com/mirantis/mk/Gerrit.groovy +++ b/src/com/mirantis/mk/Gerrit.groovy @@ -76,7 +76,7 @@ def gerritPatchsetCheckout(LinkedHashMap config, List extraScmExtensions = []) { scmUserRemoteConfigs.put('credentialsId',credentials) } - // Usefull, if we only need to clone branch. W\o any refspec magic + // Useful, if we only need to clone branch. W\o any refspec magic if (GerritTriggerBuildChooser) { scmExtensions.add([$class: 'BuildChooserSetting', buildChooser: [$class: 'GerritTriggerBuildChooser']],) } @@ -441,7 +441,7 @@ def prepareGerritAutoCommit(LinkedHashMap params) { def jsonChange = readJSON text: gerritChange changeId = "Change-Id: ${jsonChange['id']}".toString() } catch (Exception error) { - common.errorMsg("Can't parse ouput from Gerrit. Check that user ${changeAuthorName} does not have several \ + common.errorMsg("Can't parse output from Gerrit. Check that user ${changeAuthorName} does not have several \ open commits to ${repoProject} repo and ${repoBranch} branch with topic ${changeTopic}") throw error } diff --git a/src/com/mirantis/mk/JenkinsUtils.groovy b/src/com/mirantis/mk/JenkinsUtils.groovy index 780ccabf..4f9cb9ae 100644 --- a/src/com/mirantis/mk/JenkinsUtils.groovy +++ b/src/com/mirantis/mk/JenkinsUtils.groovy @@ -113,7 +113,7 @@ def killStuckBuilds(maxSeconds, job){ runningBuilds[j].finish(hudson.model.Result.ABORTED, new java.io.IOException("Aborting build by long running jobs killer")); result = true }catch(e){ - common.errorMsg("Error occured during aborting build: Exception: ${e}") + common.errorMsg("Error occurred during aborting build: Exception: ${e}") } } } diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy index 2b1f8c9b..f4d78bed 100644 --- a/src/com/mirantis/mk/Orchestrate.groovy +++ b/src/com/mirantis/mk/Orchestrate.groovy @@ -1099,7 +1099,7 @@ def installStacklightv1Client(master, extra_tgt = '') { salt.enforceState([saltId: master, target: "I@grafana:client and *03* ${extra_tgt}", state: 'grafana.client']) // nw salt -C "I@grafana:client' --async service.restart salt-minion; sleep 10 - // Get the StackLight monitoring VIP addres + // Get the StackLight monitoring VIP address //vip=$(salt-call pillar.data _param:stacklight_monitor_address --out key|grep _param: |awk '{print $2}') //vip=${vip:=172.16.10.253} def pillar = salt.getPillar(master, "ctl01* ${extra_tgt}", '_param:stacklight_monitor_address') diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy index 30957e58..d2550681 100644 --- a/src/com/mirantis/mk/Salt.groovy +++ b/src/com/mirantis/mk/Salt.groovy @@ -854,7 +854,7 @@ def getNodeProvider(saltId, nodeName) { * @param saltId Salt Connection object or pepperEnv (the command will be sent using the selected method) * @param target Target to test * @param batch Batch param to salt (integer or string with percents) - * @return bool indicating if target was succesful + * @return bool indicating if target was successful */ def testTarget(saltId, target, batch = null) { @@ -1405,7 +1405,7 @@ def isPackageInstalled(Map params) { } /** -* Returns nubmer of worker_threads set for Salt Master +* Returns number of worker_threads set for Salt Master * * @param saltId Salt Connection object or pepperEnv * diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy index c7afbb07..bbc9f49b 100644 --- a/src/com/mirantis/mk/SaltModelTesting.groovy +++ b/src/com/mirantis/mk/SaltModelTesting.groovy @@ -8,7 +8,7 @@ package com.mirantis.mk * distribRevision - (optional) Revision of packages to use (default proposed). * runCommands - (optional) Dict with closure structure of body required tests. For example: * [ '001_Test': { sh("./run-some-test") }, '002_Test': { sh("./run-another-test") } ] - * Before execution runCommands will be sorted by key names. Alpabetical order is preferred. + * Before execution runCommands will be sorted by key names. Alphabetical order is preferred. * runFinally - (optional) Dict with closure structure of body required commands, which should be * executed in any case of test results. Same format as for runCommands * updateRepo - (optional) Whether to run common repo update step.