Merge "Catch failures in salt runs during update"
diff --git a/build-debian-packages-pipeline.groovy b/build-debian-packages-pipeline.groovy
index 5d16339..864f0bc 100644
--- a/build-debian-packages-pipeline.groovy
+++ b/build-debian-packages-pipeline.groovy
@@ -64,12 +64,16 @@
checkout changelog: true, poll: false,
scm: [$class: 'GitSCM', branches: pollBranches, doGenerateSubmoduleConfigurations: false,
extensions: extensions, submoduleCfg: [], userRemoteConfigs: userRemoteConfigs]
+
+ /* There are 2 schemas of build spec keeping:
+ 1. Separate directory with specs.
+ 2. Separate branch with build specs. I.e. debian/xenial
+ Logic below makes package build compatible with both schemas.
+ */
+ if (fileExists('debian/changelog')) {
+ debian_branch = null
+ }
if (debian_branch){
- /* There are 2 schemas of build spec keeping:
- 1. Separate branch with build specs. I.e. debian/xenial
- 2. Separate directory with specs.
- Logic below makes package build compatible with both schemas.
- */
def retStatus = sh(script: 'git checkout ' + DEBIAN_BRANCH, returnStatus: true)
if (retStatus != 0) {
common.warningMsg("Cannot checkout ${DEBIAN_BRANCH} branch. Going to build package by ${SOURCE_BRANCH} branch.")
diff --git a/cvp-spt.groovy b/cvp-spt.groovy
index ea4680f..b9d53d5 100644
--- a/cvp-spt.groovy
+++ b/cvp-spt.groovy
@@ -44,7 +44,7 @@
file: "report.xml",
nodeType: 'NODESET',
url: '',
- xpath: '/testsuite/testcase[@classname="cvp-spt.cvp_spt.tests.test_hw2hw"]/properties/property']]
+ xpath: '/testsuite/testcase[@classname="cvp_spt.tests.test_hw2hw"]/properties/property']]
plot csvFileName: 'plot-8634d2fe-dc48-4713-99f9-b69a381483bc.csv',
group: 'SPT',
style: 'line',
@@ -53,7 +53,7 @@
file: "report.xml",
nodeType: 'NODESET',
url: '',
- xpath: '/testsuite/testcase[@classname="cvp-spt.cvp_spt.tests.test_vm2vm"]/properties/property']]
+ xpath: '/testsuite/testcase[@classname="cvp_spt.tests.test_vm2vm"]/properties/property']]
}
} catch (Throwable e) {
// If there was an error or exception thrown, the build failed
diff --git a/docker-mirror-images.groovy b/docker-mirror-images.groovy
index ebbfc86..07a80e7 100644
--- a/docker-mirror-images.groovy
+++ b/docker-mirror-images.groovy
@@ -42,7 +42,7 @@
imagePath = imageArray[0]
if (imagePath.contains('SUBS_SOURCE_IMAGE_TAG')) {
common.warningMsg("Replacing SUBS_SOURCE_IMAGE_TAG => ${SOURCE_IMAGE_TAG}")
- imagePath.replace('SUBS_SOURCE_IMAGE_TAG', SOURCE_IMAGE_TAG)
+ imagePath = imagePath.replace('SUBS_SOURCE_IMAGE_TAG', SOURCE_IMAGE_TAG)
}
targetRegistry = imageArray[1]
imageName = getImageName(imagePath)
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 12dc88d..553029e 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -17,9 +17,19 @@
if (common.validInputParam('RECLASS_VERSION')) {
reclassVersion = RECLASS_VERSION
}
+slaveNode = (env.SLAVE_NODE ?: 'python&&docker')
-timeout(time: 12, unit: 'HOURS') {
- node("python&&docker") {
+// install extra formulas required only for rendering cfg01. All others - should be fetched automatically via
+// salt.master.env state, during salt-master bootstrap.
+// TODO: In the best - those data should fetched somewhere from CC, per env\context. Like option, process _enabled
+// options from CC contexts
+// currently, just mix them together in one set
+def testCfg01ExtraFormulas = 'glusterfs jenkins logrotate maas ntp rsyslog fluentd telegraf prometheus ' +
+ 'grafana backupninja auditd'
+
+
+timeout(time: 2, unit: 'HOURS') {
+ node(slaveNode) {
def templateEnv = "${env.WORKSPACE}/template"
def modelEnv = "${env.WORKSPACE}/model"
def testEnv = "${env.WORKSPACE}/test"
@@ -43,6 +53,7 @@
def templateDir = "${templateEnv}/template/dir"
def templateOutputDir = templateBaseDir
def user
+ def testResult = false
wrap([$class: 'BuildUser']) {
user = env.BUILD_USER_ID
}
@@ -50,7 +61,8 @@
currentBuild.description = clusterName
print("Using context:\n" + COOKIECUTTER_TEMPLATE_CONTEXT)
- stage ('Download Cookiecutter template') {
+ stage('Download Cookiecutter template') {
+ sh(script: 'find . -mindepth 1 -delete > /dev/null || true')
def cookiecutterTemplateUrl = templateContext.default_context.cookiecutter_template_url
def cookiecutterTemplateBranch = templateContext.default_context.cookiecutter_template_branch
git.checkoutGitRepository(templateEnv, cookiecutterTemplateUrl, 'master')
@@ -64,7 +76,7 @@
if (cookiecutterTemplateBranch == '') {
cookiecutterTemplateBranch = mcpVersion
// Don't have nightly/testing/stable for cookiecutter-templates repo, therefore use master
- if(mcpVersion == "nightly" || mcpVersion == "testing" || mcpVersion == "stable"){
+ if ([ "nightly" , "testing", "stable" ].contains(mcpVersion)) {
cookiecutterTemplateBranch = 'master'
}
}
@@ -72,7 +84,7 @@
}
}
- stage ('Create empty reclass model') {
+ stage('Create empty reclass model') {
dir(path: modelEnv) {
sh "rm -rfv .git"
sh "git init"
@@ -89,8 +101,9 @@
// Use mcpVersion git tag if not specified branch for reclass-system
if (sharedReclassBranch == '') {
sharedReclassBranch = mcpVersion
- // Don't have nightly/testing/stable for reclass-system repo, therefore use master
- if(mcpVersion == "nightly" || mcpVersion == "testing" || mcpVersion == "stable"){
+ // Don't have nightly/testing for reclass-system repo, therefore use master
+ if ([ "nightly" , "testing", "stable" ].contains(mcpVersion)) {
+ common.warningMsg("Fetching reclass-system from master!")
sharedReclassBranch = 'master'
}
}
@@ -142,11 +155,11 @@
}
}
- if(localRepositories && !offlineDeployment){
+ if (localRepositories && !offlineDeployment) {
def aptlyModelUrl = templateContext.default_context.local_model_url
dir(path: modelEnv) {
ssh.agentSh "git submodule add \"${aptlyModelUrl}\" \"classes/cluster/${clusterName}/cicd/aptly\""
- if(!(mcpVersion in ["nightly", "testing", "stable"])){
+ if (!(mcpVersion in ["nightly", "testing", "stable"])) {
ssh.agentSh "cd \"classes/cluster/${clusterName}/cicd/aptly\";git fetch --tags;git checkout ${mcpVersion}"
}
}
@@ -173,16 +186,16 @@
stage("Test") {
if (TEST_MODEL.toBoolean() && sharedReclassUrl != '') {
- def testResult = false
sh("cp -r ${modelEnv} ${testEnv}")
def DockerCName = "${env.JOB_NAME.toLowerCase()}_${env.BUILD_TAG.toLowerCase()}"
+ common.infoMsg("Attempt to run test against formula-version: ${mcpVersion}")
testResult = saltModelTesting.setupAndTestNode(
"${saltMaster}.${clusterDomain}",
"",
- "",
+ testCfg01ExtraFormulas,
testEnv,
'pkg',
- 'stable',
+ mcpVersion,
reclassVersion,
0,
false,
@@ -193,8 +206,7 @@
if (testResult) {
common.infoMsg("Test finished: SUCCESS")
} else {
- common.infoMsg('Test finished: FAILURE')
- throw new RuntimeException('Test stage finished: FAILURE')
+ common.warningMsg('Test finished: FAILURE')
}
} else {
common.warningMsg("Test stage has been skipped!")
@@ -208,16 +220,18 @@
def mcpCommonScriptsBranch = templateContext.default_context.mcp_common_scripts_branch
if (mcpCommonScriptsBranch == '') {
mcpCommonScriptsBranch = mcpVersion
- // Don't have nightly for mcp-common-scripts repo, therefore use master
- if(mcpVersion == "nightly"){
+ // Don't have n/t/s for mcp-common-scripts repo, therefore use master
+ if ([ "nightly" , "testing", "stable" ].contains(mcpVersion)) {
+ common.warningMsg("Fetching mcp-common-scripts from master!")
mcpCommonScriptsBranch = 'master'
}
}
def config_drive_script_url = "https://raw.githubusercontent.com/Mirantis/mcp-common-scripts/${mcpCommonScriptsBranch}/config-drive/create_config_drive.sh"
def user_data_script_url = "https://raw.githubusercontent.com/Mirantis/mcp-common-scripts/${mcpCommonScriptsBranch}/config-drive/master_config.sh"
-
- sh "wget -O create-config-drive ${config_drive_script_url} && chmod +x create-config-drive"
- sh "wget -O user_data.sh ${user_data_script_url}"
+ common.retry(3, 5) {
+ sh "wget -O create-config-drive ${config_drive_script_url} && chmod +x create-config-drive"
+ sh "wget -O user_data.sh ${user_data_script_url}"
+ }
sh "git clone --mirror https://github.com/Mirantis/mk-pipelines.git ${pipelineEnv}/mk-pipelines"
sh "git clone --mirror https://github.com/Mirantis/pipeline-library.git ${pipelineEnv}/pipeline-library"
@@ -231,7 +245,7 @@
smc['DEPLOY_NETWORK_NETMASK'] = templateContext['default_context']['deploy_network_netmask']
smc['DNS_SERVERS'] = templateContext['default_context']['dns_server01']
smc['MCP_VERSION'] = "${mcpVersion}"
- if (templateContext['default_context']['local_repositories'] == 'True'){
+ if (templateContext['default_context']['local_repositories'] == 'True') {
def localRepoIP = templateContext['default_context']['local_repo_url']
smc['MCP_SALT_REPO_KEY'] = "http://${localRepoIP}/public.gpg"
smc['MCP_SALT_REPO_URL'] = "http://${localRepoIP}/ubuntu-xenial"
@@ -239,8 +253,8 @@
smc['PIPELINE_REPO_URL'] = "http://${localRepoIP}:8088"
smc['LOCAL_REPOS'] = 'true'
}
- if (templateContext['default_context']['upstream_proxy_enabled'] == 'True'){
- if (templateContext['default_context']['upstream_proxy_auth_enabled'] == 'True'){
+ if (templateContext['default_context']['upstream_proxy_enabled'] == 'True') {
+ if (templateContext['default_context']['upstream_proxy_auth_enabled'] == 'True') {
smc['http_proxy'] = 'http://' + templateContext['default_context']['upstream_proxy_user'] + ':' + templateContext['default_context']['upstream_proxy_password'] + '@' + templateContext['default_context']['upstream_proxy_address'] + ':' + templateContext['default_context']['upstream_proxy_port']
smc['https_proxy'] = 'http://' + templateContext['default_context']['upstream_proxy_user'] + ':' + templateContext['default_context']['upstream_proxy_password'] + '@' + templateContext['default_context']['upstream_proxy_address'] + ':' + templateContext['default_context']['upstream_proxy_port']
} else {
@@ -260,7 +274,7 @@
// save cfg iso to artifacts
archiveArtifacts artifacts: "output-${clusterName}/${saltMaster}.${clusterDomain}-config.iso"
- if (templateContext['default_context']['local_repositories'] == 'True'){
+ if (templateContext['default_context']['local_repositories'] == 'True') {
def aptlyServerHostname = templateContext.default_context.aptly_server_hostname
def user_data_script_apt_url = "https://raw.githubusercontent.com/Mirantis/mcp-common-scripts/master/config-drive/mirror_config.sh"
sh "wget -O mirror_config.sh ${user_data_script_apt_url}"
@@ -284,8 +298,8 @@
}
}
- stage ('Save changes reclass model') {
- sh(returnStatus: true, script: "tar -zcf output-${clusterName}/${clusterName}.tar.gz -C ${modelEnv} .")
+ stage('Save changes reclass model') {
+ sh(returnStatus: true, script: "tar -czf output-${clusterName}/${clusterName}.tar.gz --exclude='*@tmp' -C ${modelEnv} .")
archiveArtifacts artifacts: "output-${clusterName}/${clusterName}.tar.gz"
@@ -295,21 +309,24 @@
body: "Mirantis Jenkins\n\nRequested reclass model ${clusterName} has been created and attached to this email.\nEnjoy!\n\nMirantis",
subject: "Your Salt model ${clusterName}")
}
- dir("output-${clusterName}"){
+ dir("output-${clusterName}") {
deleteDir()
}
}
+ // Fail, but leave possibility to get failed artifacts
+ if (!testResult && TEST_MODEL.toBoolean()) {
+ common.warningMsg('Test finished: FAILURE. Please check logs and\\or debug failed model manually!')
+ error('Test stage finished: FAILURE')
+ }
+
} catch (Throwable e) {
- // If there was an error or exception thrown, the build failed
currentBuild.result = "FAILURE"
currentBuild.description = currentBuild.description ? e.message + " " + currentBuild.description : e.message
throw e
} finally {
- stage ('Clean workspace directories') {
- sh(returnStatus: true, script: "rm -rf ${templateEnv}")
- sh(returnStatus: true, script: "rm -rf ${modelEnv}")
- sh(returnStatus: true, script: "rm -rf ${pipelineEnv}")
+ stage('Clean workspace directories') {
+ sh(script: 'find . -mindepth 1 -delete > /dev/null || true')
}
// common.sendNotification(currentBuild.result,"",["slack"])
}
diff --git a/tag-git-repos.groovy b/tag-git-repos.groovy
index dabbb7f..312ec9e 100644
--- a/tag-git-repos.groovy
+++ b/tag-git-repos.groovy
@@ -44,7 +44,7 @@
repoCommit = repoArray[2]
if (repoCommit.contains('SUBS_SOURCE_REF')) {
common.warningMsg("Replacing SUBS_SOURCE_REF => ${SOURCE_TAG}")
- repoCommit.replace('SUBS_SOURCE_REF', SOURCE_TAG
+ repoCommit = repoCommit.replace('SUBS_SOURCE_REF', SOURCE_TAG
)
}
gitRepoAddTag(repoUrl, repoName, TAG, GIT_CREDENTIALS, repoCommit)
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index ca4eb67..0caef9c 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -4,28 +4,19 @@
* DEFAULT_GIT_URL
* CREDENTIALS_ID
* KITCHEN_TESTS_PARALLEL
- * RUN_TEST_IN_DOCKER If true, run test stage in docker
* SMOKE_TEST_DOCKER_IMG Docker image for run test (default "ubuntu:16.04")
*/
common = new com.mirantis.mk.Common()
def gerrit = new com.mirantis.mk.Gerrit()
def ruby = new com.mirantis.mk.Ruby()
-def gerritRef
-try {
- gerritRef = GERRIT_REFSPEC
-} catch (MissingPropertyException e) {
- gerritRef = null
-}
-
-def defaultGitRef, defaultGitUrl
-try {
- defaultGitRef = DEFAULT_GIT_REF
- defaultGitUrl = DEFAULT_GIT_URL
-} catch (MissingPropertyException e) {
- defaultGitRef = null
- defaultGitUrl = null
-}
+def gerritRef = env.GERRIT_REFSPEC ?: null
+def defaultGitRef = env.DEFAULT_GIT_REF ?: null
+def defaultGitUrl = env.DEFAULT_GIT_URL ?: null
+def slaveNode = env.SLAVE_NODE ?: 'python&&docker'
+def saltVersion = env.SALT_VERSION ?: ""
+def dockerLib = new com.mirantis.mk.Docker()
+def img = dockerLib.getImage(env.SMOKE_TEST_DOCKER_IMG, "ubuntu:16.04")
def checkouted = false
@@ -70,9 +61,13 @@
[$class: 'StringParameterValue', name: 'SALT_VERSION', value: SALT_VERSION]
]
}
-timeout(time: 12, unit: 'HOURS') {
- node("python") {
+timeout(time: 2, unit: 'HOURS') {
+ node(slaveNode) {
try {
+ if (fileExists("tests/build")) {
+ common.infoMsg('Cleaning test env')
+ sh ("sudo rm -rf tests/build")
+ }
stage("checkout") {
if (gerritRef) {
// job is triggered by Gerrit
@@ -102,39 +97,39 @@
throw new Exception("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
}
}
- stage("test") {
- if (checkouted) {
- try {
- saltVersion = SALT_VERSION
- } catch (MissingPropertyException e) {
- saltVersion = "" // default value is empty string, means latest
- }
- withEnv(["SALT_VERSION=${saltVersion}"]) {
- boolean run_test_in_docker = (env.RUN_TEST_IN_DOCKER ?: false).toBoolean()
- if (run_test_in_docker) {
- def dockerLib = new com.mirantis.mk.Docker()
- def img = dockerLib.getImage(env.SMOKE_TEST_DOCKER_IMG, "ubuntu:16.04")
- def workspace = common.getWorkspace()
- img.inside("-u root:root -v ${workspace}/:/formula/") {
- sh("""cd /etc/apt/ && echo > sources.list \
- && echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> sources.list \
- && echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> sources.list \
- && echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu xenial-backports main restricted universe multiverse" >> sources.list \
- && echo 'Acquire::Languages "none";' > apt.conf.d/docker-no-languages \
- && echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > apt.conf.d/docker-gzip-indexes \
- && echo 'APT::Get::Install-Recommends "false"; APT::Get::Install-Suggests "false";' > apt.conf.d/docker-recommends \
- && apt-get update \
- && apt-get install -y git-core wget curl apt-transport-https \
- && apt-get install -y python-pip python3-pip python-virtualenv python3-virtualenv python-yaml autoconf build-essential""")
- sh("cd /formula/ && make clean && make test")
+ stage("test") {
+ if (checkouted) {
+ try {
+ // TODO add try\finally for image-stuck case. (copy-paste from SaltModelTesting)
+ withEnv(["SALT_VERSION=${saltVersion}"]) {
+ img.inside("-v ${env.WORKSPACE}/:/formula/ -u root:root --cpus=4 --ulimit nofile=4096:8192") {
+ sh('''#!/bin/bash -xe
+ cd /etc/apt/
+ echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu xenial main restricted universe" > sources.list
+ echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu xenial-updates main restricted universe" >> sources.list
+ echo 'Acquire::Languages "none";' > apt.conf.d/docker-no-languages
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > apt.conf.d/docker-gzip-indexes
+ echo 'APT::Get::Install-Recommends "false"; APT::Get::Install-Suggests "false";' > apt.conf.d/docker-recommends
+ apt-get update
+ apt-get install -y git-core wget curl apt-transport-https
+ apt-get install -y python-pip python3-pip python-virtualenv python3-virtualenv python-yaml autoconf build-essential
+ cd /formula/
+ make clean
+ make test
+ make clean
+ ''')
+ }
}
- } else {
- common.warningMsg("Those tests should be always be run in clean env! Recommends to use docker env!")
- sh("make clean && make test")
+ }
+ finally {
+ if (fileExists("tests/build")) {
+ common.infoMsg('Cleaning test env')
+ sh ("sudo rm -rf tests/build")
+ }
}
}
+
}
- }
stage("kitchen") {
if (checkouted) {
if (fileExists(".kitchen.yml")) {
diff --git a/update-package.groovy b/update-package.groovy
index c3882fe..10f3a85 100644
--- a/update-package.groovy
+++ b/update-package.groovy
@@ -11,12 +11,10 @@
* TARGET_BATCH_LIVE Batch size for the complete live package update on all nodes, empty string means apply to all targetted nodes.
*
**/
-
+pepperEnv = "pepperEnv"
+salt = new com.mirantis.mk.Salt()
def common = new com.mirantis.mk.Common()
-def salt = new com.mirantis.mk.Salt()
def python = new com.mirantis.mk.Python()
-
-def pepperEnv = "pepperEnv"
def targetTestSubset
def targetLiveSubset
def targetLiveAll
@@ -25,6 +23,10 @@
def packages
def command
def commandKwargs
+def installSaltStack(target, pkgs){
+ salt.runSaltProcessStep(pepperEnv, target, 'pkg.install', ["force_yes=True", "pkgs='$pkgs'"], null, true, 30)
+}
+
timeout(time: 12, unit: 'HOURS') {
node() {
try {
@@ -89,6 +91,20 @@
}
stage('Apply package upgrades on sample') {
+ if(packages == null || packages.contains("salt-master") || packages.contains("salt-common") || packages.contains("salt-minion") || packages.contains("salt-api")){
+ def saltTargets = (targetLiveSubset.split(' or ').collect{it as String})
+ for(int i = 0; i < saltTargets.size(); i++ ){
+ common.infoMsg("During salt-minion upgrade on cfg node, pipeline lose connectivy to salt-master for 2 min. If pipeline ended with error rerun pipeline again.")
+ common.retry(10, 5) {
+ if(salt.minionsReachable(pepperEnv, 'I@salt:master', "I@salt:master and ${saltTargets[i]}")){
+ installSaltStack("I@salt:master and ${saltTargets[i]}", '["salt-master", "salt-common", "salt-api", "salt-minion"]')
+ }
+ if(salt.minionsReachable(pepperEnv, 'I@salt:master', "I@salt:minion and not I@salt:master and ${saltTargets[i]}")){
+ installSaltStack("I@salt:minion and not I@salt:master and ${saltTargets[i]}", '["salt-minion"]')
+ }
+ }
+ }
+ }
out = salt.runSaltCommand(pepperEnv, 'local', ['expression': targetLiveSubset, 'type': 'compound'], command, null, packages, commandKwargs)
salt.printSaltCommandResult(out)
for(value in out.get("return")[0].values()){
@@ -105,6 +121,22 @@
}
stage('Apply package upgrades on all nodes') {
+
+ if(packages == null || packages.contains("salt-master") || packages.contains("salt-common") || packages.contains("salt-minion") || packages.contains("salt-api")){
+ def saltTargets = (targetLiveAll.split(' or ').collect{it as String})
+ for(int i = 0; i < saltTargets.size(); i++ ){
+ common.infoMsg("During salt-minion upgrade on cfg node, pipeline lose connectivy to salt-master for 2 min. If pipeline ended with error rerun pipeline again.")
+ common.retry(10, 5) {
+ if(salt.minionsReachable(pepperEnv, 'I@salt:master', "I@salt:master and ${saltTargets[i]}")){
+ installSaltStack("I@salt:master and ${saltTargets[i]}", '["salt-master", "salt-common", "salt-api", "salt-minion"]')
+ }
+ if(salt.minionsReachable(pepperEnv, 'I@salt:master', "I@salt:minion and not I@salt:master and ${saltTargets[i]}")){
+ installSaltStack("I@salt:minion and not I@salt:master and ${saltTargets[i]}", '["salt-minion"]')
+ }
+ }
+ }
+ }
+
out = salt.runSaltCommand(pepperEnv, 'local', ['expression': targetLiveAll, 'type': 'compound'], command, null, packages, commandKwargs)
salt.printSaltCommandResult(out)
for(value in out.get("return")[0].values()){
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index fb291ab..d5c0e77 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -64,7 +64,12 @@
archiveArtifacts artifacts: "$filename"
}
-timeout(time: 12, unit: 'HOURS') {
+def pipelineTimeout = 12
+if (common.validInputParam('PIPELINE_TIMEOUT') && PIPELINE_TIMEOUT.isInteger()) {
+ pipelineTimeout = "${PIPELINE_TIMEOUT}".toInteger()
+}
+
+timeout(time: pipelineTimeout, unit: 'HOURS') {
node("python") {
try {
def gitMcpVersion = MCP_VERSION