Merge "Change MCP_VERSION => TARGET_MCP_VERSION for upgrade"
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 566caa9..7dfe312 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -5,7 +5,7 @@
* Expected parameters:
* SALT_MASTER_URL Salt API server location
* SALT_MASTER_CREDENTIALS Credentials to the Salt API
- * MCP_VERSION Version of MCP to upgrade to
+ * TARGET_MCP_VERSION Version of MCP to upgrade to
* UPGRADE_SALTSTACK Upgrade SaltStack packages to new version.
* UPDATE_CLUSTER_MODEL Update MCP version parameter in cluster model
* UPDATE_PIPELINES Update pipeline repositories on Gerrit
@@ -20,7 +20,7 @@
venvPepper = "venvPepper"
workspace = ""
-def triggerMirrorJob(jobName){
+def triggerMirrorJob(jobName) {
params = jenkinsUtils.getJobParameters(jobName)
build job: jobName, parameters: [
[$class: 'StringParameterValue', name: 'BRANCHES', value: params.get("BRANCHES")],
@@ -30,16 +30,17 @@
]
}
-def updateSaltStack(target, pkgs){
- try{
+def updateSaltStack(target, pkgs) {
+ try {
salt.runSaltProcessStep(venvPepper, target, 'pkg.install', ["force_yes=True", "pkgs='$pkgs'"], null, true, 5)
- }catch(Exception ex){}
+ } catch (Exception ex) {
+ }
- common.retry(20, 60){
+ common.retry(20, 60) {
salt.minionsReachable(venvPepper, 'I@salt:master', '*')
def running = salt.runSaltProcessStep(venvPepper, target, 'saltutil.running', [], null, true, 5)
- for(value in running.get("return")[0].values()){
- if(value != []){
+ for (value in running.get("return")[0].values()) {
+ if (value != []) {
throw new Exception("Not all salt-minions are ready for execution")
}
}
@@ -49,15 +50,15 @@
def saltMinionVersions = salt.cmdRun(venvPepper, target, "apt-cache policy salt-common | awk '/Installed/ && /$saltVersion/'").get("return")
def saltMinionVersion = ""
- for(minion in saltMinionVersions[0].keySet()){
- saltMinionVersion = saltMinionVersions[0].get(minion).replace("Salt command execution success","").trim()
- if(saltMinionVersion == ""){
+ for (minion in saltMinionVersions[0].keySet()) {
+ saltMinionVersion = saltMinionVersions[0].get(minion).replace("Salt command execution success", "").trim()
+ if (saltMinionVersion == "") {
error("Installed version of Salt on $minion doesn't match specified version in the model.")
}
}
}
-def archiveReclassInventory(filename){
+def archiveReclassInventory(filename) {
def ret = salt.cmdRun(venvPepper, 'I@salt:master', "reclass -i", true, null, false)
def reclassInv = ret.values()[0]
writeFile file: filename, text: reclassInv.toString()
@@ -72,46 +73,49 @@
timeout(time: pipelineTimeout, unit: 'HOURS') {
node("python") {
try {
- def gitMcpVersion = MCP_VERSION
workspace = common.getWorkspace()
+ if (env.TARGET_MCP_VERSION == "") {
+ error("You must specify MCP version in TARGET_MCP_VERSION variable ")
+ }
+ def gitTargetMcpVersion = env.TARGET_MCP_VERSION
+ if (env.TARGET_MCP_VERSION == "testing") {
+ gitTargetMcpVersion = "master"
+ }
python.setupPepperVirtualenv(venvPepper, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
- if(MCP_VERSION == ""){
- error("You must specify MCP version")
- }
- if(MCP_VERSION == "testing"){
- gitMcpVersion = "master"
- }
-
- stage("Update Reclass"){
+ stage("Update Reclass") {
def cluster_name = salt.getPillar(venvPepper, 'I@salt:master', "_param:cluster_name").get("return")[0].values()[0]
- try{
+ try {
salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/ && git diff-index --quiet HEAD --")
}
- catch(Exception ex){
+ catch (Exception ex) {
error("You have uncommited changes in your Reclass cluster model repository. Please commit or reset them and rerun the pipeline.")
}
- if(UPDATE_CLUSTER_MODEL.toBoolean()){
+ if (UPDATE_CLUSTER_MODEL.toBoolean()) {
+ common.infoMsg('Perform: UPDATE_CLUSTER_MODEL')
def dateTime = common.getDatetime()
salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/$cluster_name && " +
- "grep -r --exclude-dir=apty -l 'apt_mk_version: .*' * | xargs sed -i 's/apt_mk_version: .*/apt_mk_version: \"$MCP_VERSION\"/g'")
- salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/system && git checkout $gitMcpVersion")
+ "grep -r --exclude-dir=aptly -l 'mcp_version: .*' * | xargs sed -i 's/mcp_version: .*/mcp_version: \"$env.TARGET_MCP_VERSION\"/g'")
+ // Do the same, for deprecated variable-duplicate
+ salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/$cluster_name && " +
+ "grep -r --exclude-dir=aptly -l 'apt_mk_version: .*' * | xargs sed -i 's/apt_mk_version: .*/apt_mk_version: \"$env.TARGET_MCP_VERSION\"/g'")
+ salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/system && git checkout $gitTargetMcpVersion")
// Add new defaults
common.infoMsg("Add new defaults")
salt.cmdRun(venvPepper, 'I@salt:master', "grep '^- system.defaults\$' /srv/salt/reclass/classes/cluster/$cluster_name/infra/init.yml || " +
- "sed -i 's/^classes:/classes:\\n- system.defaults/' /srv/salt/reclass/classes/cluster/$cluster_name/infra/init.yml")
+ "sed -i 's/^classes:/classes:\\n- system.defaults/' /srv/salt/reclass/classes/cluster/$cluster_name/infra/init.yml")
common.infoMsg("The following changes were made to the cluster model and will be commited. " +
- "Please consider if you want to push them to the remote repository or not. You have to do this manually when the run is finished.")
+ "Please consider if you want to push them to the remote repository or not. You have to do this manually when the run is finished.")
salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/$cluster_name && git diff")
salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/$cluster_name && git status && " +
- "git add -u && git commit --allow-empty -m 'Cluster model update to the release $MCP_VERSION on $dateTime'")
+ "git add -u && git commit --allow-empty -m 'Cluster model update to the release $env.TARGET_MCP_VERSION on $dateTime'")
}
salt.enforceState(venvPepper, 'I@salt:master', 'reclass.storage', true)
}
- if(UPDATE_LOCAL_REPOS.toBoolean()){
+ if (UPDATE_LOCAL_REPOS.toBoolean()) {
def cluster_name = salt.getPillar(venvPepper, 'I@salt:master', "_param:cluster_name").get("return")[0].values()[0]
- stage("Update local repos"){
+ stage("Update local repos") {
common.infoMsg("Updating local repositories")
def engine = salt.getPillar(venvPepper, 'I@aptly:publisher', "aptly:publisher:source:engine")
@@ -119,25 +123,22 @@
if (runningOnDocker) {
common.infoMsg("Aptly is running as Docker container")
- }
- else {
+ } else {
common.infoMsg("Aptly isn't running as Docker container. Going to use aptly user for executing aptly commands")
}
- if(runningOnDocker){
+ if (runningOnDocker) {
salt.cmdRun(venvPepper, 'I@aptly:publisher', "aptly mirror list --raw | grep -E '*' | xargs -n 1 aptly mirror drop -force", true, null, true)
- }
- else{
- salt.cmdRun(venvPepper, 'I@aptly:publisher', "aptly mirror list --raw | grep -E '*' | xargs -n 1 aptly mirror drop -force", true, null, true, ['runas=aptly'])
+ } else {
+ salt.cmdRun(venvPepper, 'I@aptly:publisher', "aptly mirror list --raw | grep -E '*' | xargs -n 1 aptly mirror drop -force", true, null, true, ['runas=aptly'])
}
salt.enforceState(venvPepper, 'I@aptly:publisher', 'aptly', true)
- if(runningOnDocker){
+ if (runningOnDocker) {
salt.runSaltProcessStep(venvPepper, 'I@aptly:publisher', 'cmd.script', ['salt://aptly/files/aptly_mirror_update.sh', "args=-sv"], null, true)
salt.runSaltProcessStep(venvPepper, 'I@aptly:publisher', 'cmd.script', ['salt://aptly/files/aptly_publish_update.sh', "args=-frv -u http://10.99.0.1:8080"], null, true)
- }
- else{
+ } else {
salt.runSaltProcessStep(venvPepper, 'I@aptly:publisher', 'cmd.script', ['salt://aptly/files/aptly_mirror_update.sh', "args=-sv", 'runas=aptly'], null, true)
salt.runSaltProcessStep(venvPepper, 'I@aptly:publisher', 'cmd.script', ['salt://aptly/files/aptly_publish_update.sh', "args=-afrv", 'runas=aptly'], null, true)
}
@@ -152,12 +153,12 @@
}
}
- stage("Update Drivetrain"){
- salt.cmdRun(venvPepper, 'I@salt:master', "sed -i -e 's/[^ ]*[^ ]/$MCP_VERSION/4' /etc/apt/sources.list.d/mcp_salt.list")
+ stage("Update Drivetrain") {
+ salt.cmdRun(venvPepper, 'I@salt:master', "sed -i -e 's/[^ ]*[^ ]/$env.TARGET_MCP_VERSION/4' /etc/apt/sources.list.d/mcp_salt.list")
salt.cmdRun(venvPepper, 'I@salt:master', "apt-get -o Dir::Etc::sourcelist='/etc/apt/sources.list.d/mcp_salt.list' -o Dir::Etc::sourceparts='-' -o APT::Get::List-Cleanup='0' update")
// Workaround for PROD-22108
salt.cmdRun(venvPepper, 'I@salt:master', "apt-get purge -y salt-formula-octavia && " +
- "apt-get install -y salt-formula-octavia")
+ "apt-get install -y salt-formula-octavia")
// End workaround for PROD-22108
salt.cmdRun(venvPepper, 'I@salt:master', "apt-get install -y --allow-downgrades salt-formula-*")
@@ -166,25 +167,25 @@
archiveReclassInventory(inventoryBeforeFilename)
- salt.cmdRun(venvPepper, 'I@salt:master', "sed -i -e 's/[^ ]*[^ ]/$MCP_VERSION/4' /etc/apt/sources.list.d/mcp_extra.list")
+ salt.cmdRun(venvPepper, 'I@salt:master', "sed -i -e 's/[^ ]*[^ ]/$env.TARGET_MCP_VERSION/4' /etc/apt/sources.list.d/mcp_extra.list")
salt.cmdRun(venvPepper, 'I@salt:master', "apt-get -o Dir::Etc::sourcelist='/etc/apt/sources.list.d/mcp_extra.list' -o Dir::Etc::sourceparts='-' -o APT::Get::List-Cleanup='0' update")
salt.cmdRun(venvPepper, 'I@salt:master', "apt-get install -y --allow-downgrades reclass")
salt.fullRefresh(venvPepper, 'I@salt:master')
- try{
+ try {
salt.enforceState(venvPepper, "I@salt:master", 'reclass', true)
}
- catch(Exception ex){
+ catch (Exception ex) {
error("Reclass fails rendering. Pay attention to your cluster model.")
}
salt.fullRefresh(venvPepper, '*')
- try{
+ try {
salt.cmdRun(venvPepper, 'I@salt:master', "reclass-salt --top")
}
- catch(Exception ex){
+ catch (Exception ex) {
error("Reclass fails rendering. Pay attention to your cluster model.")
}
@@ -193,7 +194,7 @@
sh "diff -u $inventoryBeforeFilename $inventoryAfterFilename > reclass-inventory-diff.out || true"
archiveArtifacts artifacts: "reclass-inventory-diff.out"
- if(UPGRADE_SALTSTACK.toBoolean()){
+ if (UPGRADE_SALTSTACK.toBoolean()) {
salt.enforceState(venvPepper, "I@linux:system", 'linux.system.repo', true)
updateSaltStack("I@salt:master", '["salt-master", "salt-common", "salt-api", "salt-minion"]')
@@ -201,7 +202,7 @@
updateSaltStack("I@salt:minion and not I@salt:master", '["salt-minion"]')
}
- if(UPDATE_PIPELINES.toBoolean()){
+ if (UPDATE_PIPELINES.toBoolean()) {
triggerMirrorJob("git-mirror-downstream-mk-pipelines")
triggerMirrorJob("git-mirror-downstream-pipeline-library")
}
@@ -214,12 +215,12 @@
common.infoMsg("Checking if Docker containers are up")
- try{
- common.retry(10, 30){
+ try {
+ common.retry(10, 30) {
salt.cmdRun(venvPepper, 'I@jenkins:client and I@docker:client', "! docker service ls | tail -n +2 | grep -v -E '\\s([0-9])/\\1\\s'")
}
}
- catch(Exception ex){
+ catch (Exception ex) {
error("Docker containers for CI/CD services are having troubles with starting.")
}
}