1. clamav-devel
  2. Commit 5f6831e990fb343eb7f6d4285cd1d76c5106e0cf
Browse code

Update Jenkinsfile with test framework changes

Micah Snyder authored on 2019/12/18 14:41:18
Showing 1 changed files
Jenkinsfile
History View file @ 5f6831e
... ... 
@@ -11,28 +11,34 @@ properties(
11 11 
                        description: 'ClamAV version string'),
12 12 
                 string(name: 'BUILD_BRANCH',
13 13 
                        defaultValue: 'build-0.102',
14 
-                       description: 'build-acceptance branch'),
15 
-                string(name: 'BUILD_ENGINE_BRANCH',
16 
-                       defaultValue: 'master',
17 
-                       description: 'build-acceptance engine branch'),
14 
+                       description: 'test-pipelines branch for build acceptance'),
15 
+                string(name: 'FRAMEWORK_BRANCH',
16 
+                       defaultValue: 'dev/0.102',
17 
+                       description: 'test-framework branch'),
18 18 
                 string(name: 'TEST_BRANCH',
19 19 
                        defaultValue: 'dev/0.102',
20 20 
                        description: 'tests branch'),
21 
+                string(name: 'TEST_CUSTOM_BRANCH',
22 
+                       defaultValue: 'dev/0.102',
23 
+                       description: 'tests-custom branch'),
21 24 
                 string(name: 'REGULAR_PIPELINE',
22 
-                       defaultValue: 'regular-scripted-chain-0.102',
25 
+                       defaultValue: 'regular-0.102',
23 26 
                        description: 'test-pipelines branch for regular tests.'),
24 27 
                 string(name: 'CUSTOM_PIPELINE',
25 
-                       defaultValue: 'custom-scripted-chain-0.102',
28 
+                       defaultValue: 'custom-0.102',
26 29 
                        description: 'test-pipelines branch for custom tests'),
27 30 
                 string(name: 'FUZZ_PIPELINE',
28 
-                       defaultValue: 'fuzz-regression-chain-0.102',
31 
+                       defaultValue: 'fuzz-regression-0.102',
29 32 
                        description: 'test-pipelines branch for fuzz regression tests'),
30 33 
                 string(name: 'FUZZ_BRANCH',
31 34 
                        defaultValue: 'master',
32 35 
                        description: 'private-fuzz-corpus branch'),
33 36 
                 string(name: 'FUZZ_TEST_BRANCH',
34 37 
                        defaultValue: 'dev/0.102',
35 
-                       description: 'tests-fuzz-regression branch')
38 
+                       description: 'tests-fuzz-regression branch'),
39 
+                string(name: 'SHARED_LIB_BRANCH',
40 
+                       defaultValue: 'master',
41 
+                       description: 'tests-jenkins-shared-libraries branch')
36 42 
             ]
37 43 
         )
38 44 
     ]
... ... 
@@ -42,16 +48,17 @@ def buildResult
42 42
43 43 
 node('master') {
44 44 
     stage('Build') {
45 
-        buildResult = build(job: "build-acceptance/${params.BUILD_BRANCH}",
45 
+        buildResult = build(job: "test-pipelines/${params.BUILD_BRANCH}",
46 46 
             propagate: true,
47 47 
             wait: true,
48 48 
             parameters: [
49 49 
                 [$class: 'StringParameterValue', name: 'TARGET_BRANCH', value: "${params.CLAMAV_BRANCH}"],
50 
-                [$class: 'StringParameterValue', name: 'BUILD_ENGINE_BRANCH', value: "${params.BUILD_ENGINE_BRANCH}"],
51 
-                [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
50 
+                [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
51 
+                [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
52 
+                [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
52 53 
             ]
53 54 
         )
54 
-        echo "build-acceptance/${params.BUILD_BRANCH} #${buildResult.number} succeeded."
55 
+        echo "test-pipelines/${params.BUILD_BRANCH} #${buildResult.number} succeeded."
55 56 
     }
56 57
57 58 
     stage('Test') {
... ... 
@@ -66,16 +73,18 @@ node('master') {
66 66 
                         propagate: true,
67 67 
                         wait: true,
68 68 
                         parameters: [
69 
-                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "build-acceptance/${params.BUILD_BRANCH}"],
69 
+                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_BRANCH}"],
70 70 
                             [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
71 71 
                             [$class: 'StringParameterValue', name: 'TEST_BRANCH', value: "${params.TEST_BRANCH}"],
72 
-                            [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
72 
+                            [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
73 
+                            [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
74 
+                            [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
73 75 
                         ]
74 76 
                     )
75 77 
                     echo "test-pipelines/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
76 78 
                 }
77 79 
             } catch (exc) {
78 
-                echo "test-pipelines/${params.REGULAR_PIPELINE} #${regularResult.number} failed."
80 
+                echo "test-pipelines/${params.REGULAR_PIPELINE} failed."
79 81 
                 exception = exc
80 82 
             }
81 83 
             stage("Custom Pipeline") {
... ... 
@@ -83,10 +92,12 @@ node('master') {
83 83 
                     propagate: true,
84 84 
                     wait: true,
85 85 
                     parameters: [
86 
-                        [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "build-acceptance/${params.BUILD_BRANCH}"],
86 
+                        [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_BRANCH}"],
87 87 
                         [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
88 
-                        [$class: 'StringParameterValue', name: 'TEST_BRANCH', value: "${params.TEST_BRANCH}"],
89 
-                        [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
88 
+                        [$class: 'StringParameterValue', name: 'TEST_BRANCH', value: "${params.TEST_CUSTOM_BRANCH}"],
89 
+                        [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
90 
+                        [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
91 
+                        [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
90 92 
                     ]
91 93 
                 )
92 94 
                 echo "test-pipelines/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
... ... 
@@ -103,7 +114,7 @@ node('master') {
103 103 
                     propagate: true,
104 104 
                     wait: true,
105 105 
                     parameters: [
106 
-                        [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "build-acceptance/${params.BUILD_BRANCH}"],
106 
+                        [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_BRANCH}"],
107 107 
                         [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
108 108 
                         [$class: 'StringParameterValue', name: 'FUZZ_TEST_BRANCH', value: "${params.FUZZ_TEST_BRANCH}"],
109 109 
                         [$class: 'StringParameterValue', name: 'FUZZ_BRANCH', value: "${params.FUZZ_BRANCH}"],
... ... 
@@ -120,7 +131,7 @@ node('master') {
120 120 
                     propagate: true,
121 121 
                     wait: true,
122 122 
                     parameters: [
123 
-                        [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "build-acceptance/${params.BUILD_BRANCH}"],
123 
+                        [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_BRANCH}"],
124 124 
                         [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
125 125 
                         [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
126 126 
                     ]