From 943631722d1efb13c78eb6b9f2b5ba0e9ff74e01 Mon Sep 17 00:00:00 2001 From: Vyatcheslav Suharnikov Date: Thu, 10 Sep 2020 16:35:41 +0300 Subject: [PATCH] DEX-892 Build fineness (#364) Jenkinsfiles are moved to jenkins directory --- build.Jenkinsfile => jenkins/build.Jenkinsfile | 0 deploy.Jenkinsfile => jenkins/deploy.Jenkinsfile | 2 ++ tests-kafka.Jenkinsfile => jenkins/tests-kafka.Jenkinsfile | 0 .../tests-multiple-versions.Jenkinsfile | 0 .../tests-specified-versions.Jenkinsfile | 2 +- tests.Jenkinsfile => jenkins/tests.Jenkinsfile | 4 ++-- 6 files changed, 5 insertions(+), 3 deletions(-) rename build.Jenkinsfile => jenkins/build.Jenkinsfile (100%) rename deploy.Jenkinsfile => jenkins/deploy.Jenkinsfile (98%) rename tests-kafka.Jenkinsfile => jenkins/tests-kafka.Jenkinsfile (100%) rename tests-multiple-versions.Jenkinsfile => jenkins/tests-multiple-versions.Jenkinsfile (100%) rename tests-specified-versions.Jenkinsfile => jenkins/tests-specified-versions.Jenkinsfile (98%) rename tests.Jenkinsfile => jenkins/tests.Jenkinsfile (93%) diff --git a/build.Jenkinsfile b/jenkins/build.Jenkinsfile similarity index 100% rename from build.Jenkinsfile rename to jenkins/build.Jenkinsfile diff --git a/deploy.Jenkinsfile b/jenkins/deploy.Jenkinsfile similarity index 98% rename from deploy.Jenkinsfile rename to jenkins/deploy.Jenkinsfile index a5dbebb6fd..ee831cea25 100644 --- a/deploy.Jenkinsfile +++ b/jenkins/deploy.Jenkinsfile @@ -15,6 +15,8 @@ pipeline { label 'buildagent-matcher' } options { + ansiColor('xterm') + timeout(time: 15, unit: 'MINUTES') timestamps() } environment { diff --git a/tests-kafka.Jenkinsfile b/jenkins/tests-kafka.Jenkinsfile similarity index 100% rename from tests-kafka.Jenkinsfile rename to jenkins/tests-kafka.Jenkinsfile diff --git a/tests-multiple-versions.Jenkinsfile b/jenkins/tests-multiple-versions.Jenkinsfile similarity index 100% rename from tests-multiple-versions.Jenkinsfile rename to jenkins/tests-multiple-versions.Jenkinsfile diff --git a/tests-specified-versions.Jenkinsfile b/jenkins/tests-specified-versions.Jenkinsfile similarity index 98% rename from tests-specified-versions.Jenkinsfile rename to jenkins/tests-specified-versions.Jenkinsfile index 656721f3bb..260c9b71ce 100644 --- a/tests-specified-versions.Jenkinsfile +++ b/jenkins/tests-specified-versions.Jenkinsfile @@ -4,7 +4,7 @@ pipeline { } options { ansiColor('xterm') - timeout(time: 40, unit: 'MINUTES') + timeout(time: 45, unit: 'MINUTES') timestamps() } parameters { diff --git a/tests.Jenkinsfile b/jenkins/tests.Jenkinsfile similarity index 93% rename from tests.Jenkinsfile rename to jenkins/tests.Jenkinsfile index 36f989e175..402cadcc94 100644 --- a/tests.Jenkinsfile +++ b/jenkins/tests.Jenkinsfile @@ -4,7 +4,7 @@ pipeline { } options { ansiColor('xterm') - timeout(time: 40, unit: 'MINUTES') + timeout(time: 45, unit: 'MINUTES') timestamps() } parameters { @@ -41,7 +41,7 @@ pipeline { } stage ('Push images') { steps { - build job: 'Waves.Exchange/Matcher/Push Docker Images', propagate: false, wait: false, parameters: [ + build job: 'Waves.Exchange/Matcher/Matcher Server - OS - Docker', propagate: false, wait: false, parameters: [ [$class: 'StringParameterValue', name: 'BRANCH', value: "${BRANCH_NAME}"] ] }