Skip to content
This repository was archived by the owner on Apr 17, 2019. It is now read-only.

Commit b26aaa3

Browse files
committed
Fix before merge
Signed-off-by: Alexey Rodionov <[email protected]>
1 parent 46d1b11 commit b26aaa3

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.jenkinsci/linux-post-step.groovy

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@ def linuxPostStep() {
1919
}
2020

2121
// handling build time results
22-
sh(".jenkinsci/helpers/exportBuildTime.py buildTimeResult.txt")
23-
zip archive: true, dir: '', glob: 'buildTimeResult.csv', zipFile: 'buildTimeMeasurement.zip'
24-
archiveArtifacts artifacts: 'buildTimeMeasurement.zip'
25-
26-
copyArtifacts(projectName: 'feature%2Firoha_build_time_graph', filter: 'buildTimeMeasurement.zip', target: 'buildTimeMeasurement-develop');
27-
unzip zipFile: 'buildTimeMeasurement-develop/buildTimeMeasurement.zip', dir: 'buildTimeMeasurement-develop'
28-
sh ".jenkinsci/helpers/analyzeBuildTime.py buildTimeMeasurement-develop/buildTimeResult.csv buildTimeResult.csv"
29-
archiveArtifacts artifacts: 'diff.zip'
22+
if (currentBuild.currentResult == "SUCCESS" && !fuzzingEnabled) {
23+
sh(".jenkinsci/helpers/exportBuildTime.py buildTimeResult.txt")
24+
zip archive: true, dir: '', glob: 'buildTimeResult.csv', zipFile: 'buildTimeMeasurement.zip'
25+
archiveArtifacts artifacts: 'buildTimeMeasurement.zip'
3026

27+
copyArtifacts(projectName: 'develop', filter: 'buildTimeMeasurement.zip', target: 'buildTimeMeasurement-develop');
28+
unzip zipFile: 'buildTimeMeasurement-develop/buildTimeMeasurement.zip', dir: 'buildTimeMeasurement-develop'
29+
sh ".jenkinsci/helpers/analyzeBuildTime.py buildTimeMeasurement-develop/buildTimeResult.csv buildTimeResult.csv"
30+
zip archive: true, dir: '', glob: 'diff.csv', zipFile: 'diff.zip'
31+
archiveArtifacts artifacts: 'diff.zip'
32+
}
33+
3134
if (currentBuild.currentResult == "SUCCESS" && GIT_LOCAL_BRANCH ==~ /(master|develop)/) {
3235
def artifacts = load ".jenkinsci/artifacts.groovy"
3336
def commit = env.GIT_COMMIT

Jenkinsfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ properties([parameters([
44
booleanParam(defaultValue: true, description: '', name: 'x86_64_linux'),
55
booleanParam(defaultValue: false, description: '', name: 'armv7_linux'),
66
booleanParam(defaultValue: false, description: '', name: 'armv8_linux'),
7-
booleanParam(defaultValue: false, description: '', name: 'x86_64_macos'),
7+
booleanParam(defaultValue: true, description: '', name: 'x86_64_macos'),
88
booleanParam(defaultValue: false, description: '', name: 'x86_64_win'),
99
choice(choices: 'Debug\nRelease', description: 'Iroha build type', name: 'build_type'),
1010
booleanParam(defaultValue: false, description: 'Build Java bindings', name: 'JavaBindings'),
@@ -17,11 +17,10 @@ properties([parameters([
1717
choice(choices: '26\n25\n24\n23\n22\n21\n20\n19\n18\n17\n16\n15\n14', description: 'Android Bindings ABI Version', name: 'ABABIVersion'),
1818
choice(choices: 'Release\nDebug', description: 'Android bindings build type', name: 'ABBuildType'),
1919
choice(choices: 'arm64-v8a\narmeabi-v7a\narmeabi\nx86_64\nx86', description: 'Android bindings platform', name: 'ABPlatform'),
20-
booleanParam(defaultValue: false, description: 'Build docs', name: 'Doxygen'),
21-
booleanParam(defaultValue: false, description: 'Sanitize address;leak', name: 'sanitize'),
20+
booleanParam(defaultValue: true, description: 'Build docs', name: 'Doxygen'),
21+
booleanParam(defaultValue: true, description: 'Sanitize address;leak', name: 'sanitize'),
2222
booleanParam(defaultValue: false, description: 'Build fuzzing, but do not run tests', name: 'fuzzing'),
2323
booleanParam(defaultValue: true, description: 'Collect coredumps', name: 'coredump'),
24-
booleanParam(defaultValue: true, description: 'Draw plot', name: 'plot'),
2524
string(defaultValue: '8', description: 'Expect ~3GB memory consumtion per CPU core', name: 'PARALLELISM')])])
2625

2726

0 commit comments

Comments
 (0)