| ... | ... |
@@ -24,6 +24,9 @@ properties( |
| 24 | 24 |
string(name: 'TESTS_FUZZ_BRANCH', |
| 25 | 25 |
defaultValue: '1.0', |
| 26 | 26 |
description: 'tests-fuzz-regression branch'), |
| 27 |
+ string(name: 'TEST_PIPELINES_PATH', |
|
| 28 |
+ defaultValue: 'ClamAV/test-pipelines', |
|
| 29 |
+ description: 'test-pipelines path for clamav in Jenkins'), |
|
| 27 | 30 |
string(name: 'BUILD_PIPELINE', |
| 28 | 31 |
defaultValue: 'build-1.0', |
| 29 | 32 |
description: 'test-pipelines branch for build acceptance'), |
| ... | ... |
@@ -82,7 +85,7 @@ node('master') {
|
| 82 | 82 |
def buildResult |
| 83 | 83 |
|
| 84 | 84 |
stage('Build') {
|
| 85 |
- buildResult = build(job: "test-pipelines/${params.BUILD_PIPELINE}",
|
|
| 85 |
+ buildResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.BUILD_PIPELINE}",
|
|
| 86 | 86 |
propagate: true, |
| 87 | 87 |
wait: true, |
| 88 | 88 |
parameters: [ |
| ... | ... |
@@ -93,7 +96,7 @@ node('master') {
|
| 93 | 93 |
[$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
|
| 94 | 94 |
] |
| 95 | 95 |
) |
| 96 |
- echo "test-pipelines/${params.BUILD_PIPELINE} #${buildResult.number} succeeded."
|
|
| 96 |
+ echo "${params.TEST_PIPELINES_PATH}/${params.BUILD_PIPELINE} #${buildResult.number} succeeded."
|
|
| 97 | 97 |
} |
| 98 | 98 |
|
| 99 | 99 |
stage('Test') {
|
| ... | ... |
@@ -104,13 +107,13 @@ node('master') {
|
| 104 | 104 |
def exception = null |
| 105 | 105 |
try {
|
| 106 | 106 |
stage("Regular Pipeline") {
|
| 107 |
- regularResult = build(job: "test-pipelines/${params.REGULAR_PIPELINE}",
|
|
| 107 |
+ regularResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.REGULAR_PIPELINE}",
|
|
| 108 | 108 |
propagate: true, |
| 109 | 109 |
wait: true, |
| 110 | 110 |
parameters: [ |
| 111 | 111 |
[$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
|
| 112 | 112 |
[$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
|
| 113 |
- [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_PIPELINE}"],
|
|
| 113 |
+ [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "${params.TEST_PIPELINES_PATH}/${params.BUILD_PIPELINE}"],
|
|
| 114 | 114 |
[$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
|
| 115 | 115 |
[$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_BRANCH}"],
|
| 116 | 116 |
[$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
|
| ... | ... |
@@ -118,14 +121,14 @@ node('master') {
|
| 118 | 118 |
[$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
|
| 119 | 119 |
] |
| 120 | 120 |
) |
| 121 |
- echo "test-pipelines/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
|
|
| 121 |
+ echo "${params.TEST_PIPELINES_PATH}/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
|
|
| 122 | 122 |
} |
| 123 | 123 |
} catch (exc) {
|
| 124 |
- echo "test-pipelines/${params.REGULAR_PIPELINE} failed."
|
|
| 124 |
+ echo "${params.TEST_PIPELINES_PATH}/${params.REGULAR_PIPELINE} failed."
|
|
| 125 | 125 |
exception = exc |
| 126 | 126 |
} |
| 127 | 127 |
stage("Custom Pipeline") {
|
| 128 |
- final customResult = build(job: "test-pipelines/${params.CUSTOM_PIPELINE}",
|
|
| 128 |
+ final customResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.CUSTOM_PIPELINE}",
|
|
| 129 | 129 |
propagate: true, |
| 130 | 130 |
wait: true, |
| 131 | 131 |
parameters: [ |
| ... | ... |
@@ -137,7 +140,7 @@ node('master') {
|
| 137 | 137 |
[$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
|
| 138 | 138 |
] |
| 139 | 139 |
) |
| 140 |
- echo "test-pipelines/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
|
|
| 140 |
+ echo "${params.TEST_PIPELINES_PATH}/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
|
|
| 141 | 141 |
} |
| 142 | 142 |
if(exception != null) {
|
| 143 | 143 |
echo "Custom Pipeline passed, but Regular pipeline failed!" |
| ... | ... |
@@ -147,7 +150,7 @@ node('master') {
|
| 147 | 147 |
|
| 148 | 148 |
tasks["fuzz_regression"] = {
|
| 149 | 149 |
stage("Fuzz Regression") {
|
| 150 |
- final fuzzResult = build(job: "test-pipelines/${params.FUZZ_PIPELINE}",
|
|
| 150 |
+ final fuzzResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.FUZZ_PIPELINE}",
|
|
| 151 | 151 |
propagate: true, |
| 152 | 152 |
wait: true, |
| 153 | 153 |
parameters: [ |
| ... | ... |
@@ -158,7 +161,7 @@ node('master') {
|
| 158 | 158 |
[$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
|
| 159 | 159 |
] |
| 160 | 160 |
) |
| 161 |
- echo "test-pipelines/${params.FUZZ_PIPELINE} #${fuzzResult.number} succeeded."
|
|
| 161 |
+ echo "${params.TEST_PIPELINES_PATH}/${params.FUZZ_PIPELINE} #${fuzzResult.number} succeeded."
|
|
| 162 | 162 |
} |
| 163 | 163 |
} |
| 164 | 164 |
|