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

Commit a8d697a

Browse files
linmagitlinmagit
authored
Merge branch 'master' into tianyuli-brain
2 parents 44f487c + 0db1a2a commit a8d697a

35 files changed

+1279
-870
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: c++
2+
python: 3.6
23
matrix:
34
fast_finish: true
45

@@ -141,7 +142,7 @@ install:
141142

142143
before_script:
143144
# first, run source_validator
144-
- python ./script/validators/source_validator.py
145+
- python script/validators/source_validator.py
145146

146147
# build peloton (override this value to execute tests)
147148
script:

‎Jenkinsfile

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ pipeline {
1414
}
1515
steps {
1616
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
17-
sh 'python ./script/validators/source_validator.py'
17+
sh 'python script/validators/source_validator.py'
1818
sh 'mkdir build'
1919
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
20-
sh 'cd build && make check -j4 || true'
20+
sh 'cd build && make check -j4'
2121
// sh 'cd build && cp -pr test /job/' // special tests collection step just for this stage
2222
sh 'cd build && make install'
2323
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
@@ -30,10 +30,10 @@ pipeline {
3030
agent { docker { image 'ubuntu:xenial' } }
3131
steps {
3232
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
33-
sh 'python ./script/validators/source_validator.py'
33+
sh 'python script/validators/source_validator.py'
3434
sh 'mkdir build'
3535
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
36-
sh 'cd build && make check -j4 || true'
36+
sh 'cd build && make check -j4'
3737
sh 'cd build && make install'
3838
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
3939
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -45,10 +45,10 @@ pipeline {
4545
agent { docker { image 'ubuntu:trusty' } }
4646
steps {
4747
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
48-
sh 'python ./script/validators/source_validator.py'
48+
sh 'python script/validators/source_validator.py'
4949
sh 'mkdir build'
5050
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
51-
sh 'cd build && make check -j4 || true'
51+
sh 'cd build && make check -j4'
5252
sh 'cd build && make install'
5353
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
5454
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -60,10 +60,10 @@ pipeline {
6060
agent { docker { image 'ubuntu:trusty' } }
6161
steps {
6262
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
63-
sh 'python ./script/validators/source_validator.py'
63+
sh 'python script/validators/source_validator.py'
6464
sh 'mkdir build'
6565
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
66-
sh 'cd build && make check -j4 || true'
66+
sh 'cd build && make check -j4'
6767
sh 'cd build && make install'
6868
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
6969
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -85,10 +85,10 @@ pipeline {
8585
// agent { docker { image 'debian:stretch' } }
8686
// steps {
8787
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
88-
// sh 'python ./script/validators/source_validator.py'
88+
// sh 'python script/validators/source_validator.py'
8989
// sh 'mkdir build'
9090
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
91-
// sh 'cd build && make check -j4 || true'
91+
// sh 'cd build && make check -j4'
9292
// sh 'cd build && make install'
9393
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
9494
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -100,10 +100,10 @@ pipeline {
100100
// agent { docker { image 'debian:stretch' } }
101101
// steps {
102102
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
103-
// sh 'python ./script/validators/source_validator.py'
103+
// sh 'python script/validators/source_validator.py'
104104
// sh 'mkdir build'
105105
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
106-
// sh 'cd build && make check -j4 || true'
106+
// sh 'cd build && make check -j4'
107107
// sh 'cd build && make install'
108108
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
109109
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -115,10 +115,10 @@ pipeline {
115115
// agent { docker { image 'fedora:26' } }
116116
// steps {
117117
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
118-
// sh 'python ./script/validators/source_validator.py'
118+
// sh 'python script/validators/source_validator.py'
119119
// sh 'mkdir build'
120120
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
121-
// sh 'cd build && make check -j4 || true'
121+
// sh 'cd build && make check -j4'
122122
// sh 'cd build && make install'
123123
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
124124
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -130,10 +130,10 @@ pipeline {
130130
// agent { docker { image 'fedora:26' } }
131131
// steps {
132132
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
133-
// sh 'python ./script/validators/source_validator.py'
133+
// sh 'python script/validators/source_validator.py'
134134
// sh 'mkdir build'
135135
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
136-
// sh 'cd build && make check -j4 || true'
136+
// sh 'cd build && make check -j4'
137137
// sh 'cd build && make install'
138138
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
139139
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -148,7 +148,7 @@ pipeline {
148148
sh 'python ./script/validators/source_validator.py'
149149
sh 'mkdir build'
150150
sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
151-
sh 'cd build && make check -j4 || true'
151+
sh 'cd build && make check -j4'
152152
sh 'cd build && make install'
153153
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
154154
sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -163,7 +163,7 @@ pipeline {
163163
sh 'python ./script/validators/source_validator.py'
164164
sh 'mkdir build'
165165
sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
166-
sh 'cd build && make check -j4 || true'
166+
sh 'cd build && make check -j4'
167167
sh 'cd build && make install'
168168
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
169169
sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -175,10 +175,10 @@ pipeline {
175175
// agent { docker { image 'centos:7' } }
176176
// steps {
177177
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
178-
// sh 'python ./script/validators/source_validator.py'
178+
// sh 'python script/validators/source_validator.py'
179179
// sh 'mkdir build'
180180
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
181-
// sh 'cd build && make check -j4 || true'
181+
// sh 'cd build && make check -j4'
182182
// sh 'cd build && make install'
183183
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
184184
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -190,10 +190,10 @@ pipeline {
190190
// agent { docker { image 'centos:7' } }
191191
// steps {
192192
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
193-
// sh 'python ./script/validators/source_validator.py'
193+
// sh 'python script/validators/source_validator.py'
194194
// sh 'mkdir build'
195195
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
196-
// sh 'cd build && make check -j4 || true'
196+
// sh 'cd build && make check -j4'
197197
// sh 'cd build && make install'
198198
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
199199
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
@@ -207,7 +207,7 @@ pipeline {
207207
// agent { docker { image 'ubuntu:xenial' } }
208208
// steps {
209209
// sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
210-
// sh 'python ./script/validators/source_validator.py'
210+
// sh 'python script/validators/source_validator.py'
211211
// sh 'mkdir build'
212212
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install'
213213
// }
@@ -217,7 +217,7 @@ pipeline {
217217
// agent { docker { image 'ubuntu:xenial' } }
218218
// steps {
219219
// sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
220-
// sh 'python ./script/validators/source_validator.py'
220+
// sh 'python script/validators/source_validator.py'
221221
// sh 'mkdir build'
222222
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install'
223223
// }
@@ -227,7 +227,7 @@ pipeline {
227227
// agent { docker { image 'ubuntu:trusty' } }
228228
// steps {
229229
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
230-
// sh 'python ./script/validators/source_validator.py'
230+
// sh 'python script/validators/source_validator.py'
231231
// sh 'mkdir build'
232232
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
233233
// }
@@ -237,7 +237,7 @@ pipeline {
237237
// agent { docker { image 'ubuntu:trusty' } }
238238
// steps {
239239
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
240-
// sh 'python ./script/validators/source_validator.py'
240+
// sh 'python script/validators/source_validator.py'
241241
// sh 'mkdir build'
242242
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
243243
// }
@@ -247,7 +247,7 @@ pipeline {
247247
// agent { docker { image 'fedora:26' } }
248248
// steps {
249249
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
250-
// sh 'python ./script/validators/source_validator.py'
250+
// sh 'python script/validators/source_validator.py'
251251
// sh 'mkdir build'
252252
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
253253
// }
@@ -257,7 +257,7 @@ pipeline {
257257
// agent { docker { image 'fedora:26' } }
258258
// steps {
259259
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
260-
// sh 'python ./script/validators/source_validator.py'
260+
// sh 'python script/validators/source_validator.py'
261261
// sh 'mkdir build'
262262
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
263263
// }
@@ -267,7 +267,7 @@ pipeline {
267267
// agent { docker { image 'fedora:27' } }
268268
// steps {
269269
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
270-
// sh 'python ./script/validators/source_validator.py'
270+
// sh 'python script/validators/source_validator.py'
271271
// sh 'mkdir build'
272272
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
273273
// }
@@ -277,7 +277,7 @@ pipeline {
277277
// agent { docker { image 'fedora:27' } }
278278
// steps {
279279
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
280-
// sh 'python ./script/validators/source_validator.py'
280+
// sh 'python script/validators/source_validator.py'
281281
// sh 'mkdir build'
282282
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
283283
// }

0 commit comments

Comments
 (0)