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

Commit 006f762

Browse files
Chad Doughertyapavlo
Chad Dougherty
authored and
apavlo
committed
fix directory reference in the log processing stage
also: comment out the clang builds for now, fixup some whitespace and add a few more helpful comments
1 parent e65f397 commit 006f762

File tree

1 file changed

+80
-74
lines changed

1 file changed

+80
-74
lines changed

‎Jenkinsfile

Lines changed: 80 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ pipeline {
33
stages {
44
stage('Build') {
55
parallel {
6-
// NOTE: this stage is special because it copies the test results out of the container
6+
// begin gcc builds
7+
// NOTE: this next stage is special because it copies the test results out of the container
78
stage('Ubuntu Xenial/gcc-5.4.0/llvm-3.7.1 (Debug/Test)') {
89
agent {
910
docker {
@@ -70,6 +71,7 @@ pipeline {
7071
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
7172
}
7273
}
74+
7375
stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Release)') {
7476
agent { docker { image 'fedora:26' } }
7577
steps {
@@ -109,6 +111,7 @@ pipeline {
109111
sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
110112
}
111113
}
114+
112115
stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Release)') {
113116
agent { docker { image 'centos:7' } }
114117
steps {
@@ -118,86 +121,88 @@ pipeline {
118121
sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
119122
}
120123
}
124+
// end gcc builds
121125

122-
stage('Ubuntu Xenial/clang-3.7.1/llvm-3.7.1 (Debug)') {
123-
agent { docker { image 'ubuntu:xenial' } }
124-
steps {
125-
sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
126-
sh 'python ./script/validators/source_validator.py'
127-
sh 'mkdir build'
128-
sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install'
129-
}
130-
}
126+
// begin clang builds
127+
// stage('Ubuntu Xenial/clang-3.7.1/llvm-3.7.1 (Debug)') {
128+
// agent { docker { image 'ubuntu:xenial' } }
129+
// steps {
130+
// sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
131+
// sh 'python ./script/validators/source_validator.py'
132+
// sh 'mkdir build'
133+
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install'
134+
// }
135+
// }
131136

132-
stage('Ubuntu Xenial/clang-3.7.1/llvm-3.7.1 (Release)') {
133-
agent { docker { image 'ubuntu:xenial' } }
134-
steps {
135-
sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
136-
sh 'python ./script/validators/source_validator.py'
137-
sh 'mkdir build'
138-
sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install'
139-
}
140-
}
137+
// stage('Ubuntu Xenial/clang-3.7.1/llvm-3.7.1 (Release)') {
138+
// agent { docker { image 'ubuntu:xenial' } }
139+
// steps {
140+
// sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
141+
// sh 'python ./script/validators/source_validator.py'
142+
// sh 'mkdir build'
143+
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install'
144+
// }
145+
// }
141146

142-
stage('Ubuntu Trusty/clang-3.7.1/llvm-3.7.1 (Debug)') {
143-
agent { docker { image 'ubuntu:trusty' } }
144-
steps {
145-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
146-
sh 'python ./script/validators/source_validator.py'
147-
sh 'mkdir build'
148-
sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
149-
}
150-
}
147+
// stage('Ubuntu Trusty/clang-3.7.1/llvm-3.7.1 (Debug)') {
148+
// agent { docker { image 'ubuntu:trusty' } }
149+
// steps {
150+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
151+
// sh 'python ./script/validators/source_validator.py'
152+
// sh 'mkdir build'
153+
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
154+
// }
155+
// }
151156

152-
stage('Ubuntu Trusty/clang-3.7.1/llvm-3.7.1 (Release)') {
153-
agent { docker { image 'ubuntu:trusty' } }
154-
steps {
155-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
156-
sh 'python ./script/validators/source_validator.py'
157-
sh 'mkdir build'
158-
sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
159-
}
160-
}
157+
// stage('Ubuntu Trusty/clang-3.7.1/llvm-3.7.1 (Release)') {
158+
// agent { docker { image 'ubuntu:trusty' } }
159+
// steps {
160+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
161+
// sh 'python ./script/validators/source_validator.py'
162+
// sh 'mkdir build'
163+
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
164+
// }
165+
// }
161166

162-
stage('Fedora 26/clang-4.0.1/llvm-4.0.1 (Debug)') {
163-
agent { docker { image 'fedora:26' } }
164-
steps {
165-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
166-
sh 'python ./script/validators/source_validator.py'
167-
sh 'mkdir build'
168-
sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
169-
}
170-
}
167+
// stage('Fedora 26/clang-4.0.1/llvm-4.0.1 (Debug)') {
168+
// agent { docker { image 'fedora:26' } }
169+
// steps {
170+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
171+
// sh 'python ./script/validators/source_validator.py'
172+
// sh 'mkdir build'
173+
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
174+
// }
175+
// }
171176

172-
stage('Fedora 26/clang-4.0.1/llvm-4.0.1 (Release)') {
173-
agent { docker { image 'fedora:26' } }
174-
steps {
175-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
176-
sh 'python ./script/validators/source_validator.py'
177-
sh 'mkdir build'
178-
sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
179-
}
180-
}
177+
// stage('Fedora 26/clang-4.0.1/llvm-4.0.1 (Release)') {
178+
// agent { docker { image 'fedora:26' } }
179+
// steps {
180+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
181+
// sh 'python ./script/validators/source_validator.py'
182+
// sh 'mkdir build'
183+
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
184+
// }
185+
// }
181186

182-
stage('Fedora 27/clang-4.0.1/llvm-4.0.1 (Debug)') {
183-
agent { docker { image 'fedora:27' } }
184-
steps {
185-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
186-
sh 'python ./script/validators/source_validator.py'
187-
sh 'mkdir build'
188-
sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
189-
}
190-
}
187+
// stage('Fedora 27/clang-4.0.1/llvm-4.0.1 (Debug)') {
188+
// agent { docker { image 'fedora:27' } }
189+
// steps {
190+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
191+
// sh 'python ./script/validators/source_validator.py'
192+
// sh 'mkdir build'
193+
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
194+
// }
195+
// }
191196

192-
stage('Fedora 27/clang-4.0.1/llvm-4.0.1 (Release)') {
193-
agent { docker { image 'fedora:27' } }
194-
steps {
195-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
196-
sh 'python ./script/validators/source_validator.py'
197-
sh 'mkdir build'
198-
sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
199-
}
200-
}
197+
// stage('Fedora 27/clang-4.0.1/llvm-4.0.1 (Release)') {
198+
// agent { docker { image 'fedora:27' } }
199+
// steps {
200+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
201+
// sh 'python ./script/validators/source_validator.py'
202+
// sh 'mkdir build'
203+
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
204+
// }
205+
// }
201206

202207
// Omit this configuration for now since the corresponding version of clang does not seem to be available on this platform
203208
// stage('CentOS 7/clang-??/llvm-3.9.1') {
@@ -206,14 +211,15 @@ pipeline {
206211
// sh 'lsb_release -a'
207212
// }
208213
// }
214+
// end clang builds
209215
}
210216
}
211217
}
212218

213219
// Process test results from the first build stage
214220
post {
215221
always {
216-
dir("${WORKSPACE}/../builds/${BUILD_ID}/results") {
222+
dir("${WORKSPACE}/../builds/${BUILD_ID}") {
217223
step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1, thresholds: [[$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: ''], [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']], tools: [[$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'test/*_test.xml', skipNoTestFiles: false, stopProcessingIfError: true]]])
218224
}
219225
}

0 commit comments

Comments
 (0)