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

Commit 76095b4

Browse files
schedutronschedutron
committed
Fix merge conflicts
2 parents fdc076c + b7a035b commit 76095b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1050
-278
lines changed

‎Jenkinsfile

Lines changed: 89 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@ pipeline {
55
parallel {
66
// begin gcc builds
77
// NOTE: this next stage is special because it copies the test results out of the container
8-
stage('Ubuntu Xenial/gcc-5.4.0/llvm-3.7.1 (Debug/Test)') {
8+
stage('Ubuntu Xenial/gcc-5.4.0/llvm-3.7.1 (Debug)') {
99
agent {
1010
docker {
1111
image 'ubuntu:xenial'
12-
args '-v ${WORKSPACE}/../builds/${BUILD_ID}:/job:rw'
12+
// args '-v ${WORKSPACE}/../builds/${BUILD_ID}:/job:rw'
1313
}
1414
}
1515
steps {
1616
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
1717
sh 'python script/validators/source_validator.py'
1818
sh 'mkdir build'
19-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False -DUSE_SANITIZER=Address .. && make -j4'
19+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
2020
sh 'cd build && make check -j4 || true'
21-
sh 'cd build && cp -pr test /job/'
22-
sh 'cd build && make benchmark -j4'
21+
// sh 'cd build && cp -pr test /job/' // special tests collection step just for this stage
2322
sh 'cd build && make install'
2423
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
2524
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -34,23 +33,26 @@ pipeline {
3433
sh 'python script/validators/source_validator.py'
3534
sh 'mkdir build'
3635
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
36+
sh 'cd build && make check -j4 || true'
37+
sh 'cd build && make install'
38+
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
39+
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
40+
sh 'cd build && python ../script/validators/jdbc_validator.py'
3741
}
3842
}
3943

40-
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Debug/Test/LOG_LEVEL_TRACE)') {
44+
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Debug)') {
4145
agent { docker { image 'ubuntu:trusty' } }
4246
steps {
4347
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
4448
sh 'python script/validators/source_validator.py'
4549
sh 'mkdir build'
46-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False -DUSE_SANITIZER=Address -DCMAKE_CXX_FLAGS="-DLOG_LEVEL=LOG_LEVEL_TRACE" .. && make -j4'
47-
// redirect output to /dev/null because it is voluminous
48-
// sh 'cd build && make check -j4 > /dev/null || true'
49-
// sh 'cd build && make benchmark -j4'
50-
// sh 'cd build && make install'
51-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
52-
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
53-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
50+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
51+
sh 'cd build && make check -j4 || true'
52+
sh 'cd build && make install'
53+
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
54+
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
55+
sh 'cd build && python ../script/validators/jdbc_validator.py'
5456
}
5557
}
5658

@@ -62,24 +64,31 @@ pipeline {
6264
sh 'mkdir build'
6365
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
6466
sh 'cd build && make check -j4 || true'
65-
// sh 'cd build && cp -pr test /job/'
66-
sh 'cd build && make benchmark -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
7070
sh 'cd build && python ../script/validators/jdbc_validator.py'
7171
}
7272
}
7373

74-
// stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Debug/Test)') {
74+
stage('Ubuntu Xenial/gcc-5.4.0/llvm-3.7.1 (LOG_LEVEL_TRACE)') {
75+
agent { docker { image 'ubuntu:xenial' } }
76+
steps {
77+
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
78+
sh 'python ./script/validators/source_validator.py'
79+
sh 'mkdir build'
80+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCMAKE_CXX_FLAGS="-DLOG_LEVEL=LOG_LEVEL_TRACE" -DCOVERALLS=False .. && make -j4'
81+
}
82+
}
83+
84+
// stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Debug)') {
7585
// agent { docker { image 'debian:stretch' } }
7686
// steps {
7787
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
7888
// sh 'python script/validators/source_validator.py'
7989
// sh 'mkdir build'
80-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False -DUSE_SANITIZER=Address .. && make -j4'
90+
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
8191
// sh 'cd build && make check -j4 || true'
82-
// sh 'cd build && make benchmark -j4'
8392
// sh 'cd build && make install'
8493
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
8594
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -94,6 +103,11 @@ pipeline {
94103
// sh 'python script/validators/source_validator.py'
95104
// sh 'mkdir build'
96105
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
106+
// sh 'cd build && make check -j4 || true'
107+
// sh 'cd build && make install'
108+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
109+
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
110+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
97111
// }
98112
// }
99113

@@ -103,7 +117,12 @@ pipeline {
103117
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
104118
// sh 'python script/validators/source_validator.py'
105119
// sh 'mkdir build'
106-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
120+
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
121+
// sh 'cd build && make check -j4 || true'
122+
// sh 'cd build && make install'
123+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
124+
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
125+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
107126
// }
108127
// }
109128

@@ -114,28 +133,43 @@ pipeline {
114133
// sh 'python script/validators/source_validator.py'
115134
// sh 'mkdir build'
116135
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
136+
// sh 'cd build && make check -j4 || true'
137+
// sh 'cd build && make install'
138+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
139+
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
140+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
117141
// }
118142
// }
119143

120-
// stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
121-
// agent { docker { image 'fedora:27' } }
122-
// steps {
123-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
124-
// sh 'python script/validators/source_validator.py'
125-
// sh 'mkdir build'
126-
// sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
127-
// }
128-
// }
144+
stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
145+
agent { docker { image 'fedora:27' } }
146+
steps {
147+
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
148+
sh 'python ./script/validators/source_validator.py'
149+
sh 'mkdir build'
150+
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'
152+
sh 'cd build && make install'
153+
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
154+
sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
155+
sh 'cd build && python ../script/validators/jdbc_validator.py'
156+
}
157+
}
129158

130-
// stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
131-
// agent { docker { image 'fedora:27' } }
132-
// steps {
133-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
134-
// sh 'python script/validators/source_validator.py'
135-
// sh 'mkdir build'
136-
// 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'
137-
// }
138-
// }
159+
stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
160+
agent { docker { image 'fedora:27' } }
161+
steps {
162+
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
163+
sh 'python ./script/validators/source_validator.py'
164+
sh 'mkdir build'
165+
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'
167+
sh 'cd build && make install'
168+
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
169+
sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
170+
sh 'cd build && python ../script/validators/jdbc_validator.py'
171+
}
172+
}
139173

140174
// stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
141175
// agent { docker { image 'centos:7' } }
@@ -144,6 +178,11 @@ pipeline {
144178
// sh 'python script/validators/source_validator.py'
145179
// sh 'mkdir build'
146180
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
181+
// sh 'cd build && make check -j4 || true'
182+
// sh 'cd build && make install'
183+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
184+
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
185+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
147186
// }
148187
// }
149188

@@ -154,6 +193,11 @@ pipeline {
154193
// sh 'python script/validators/source_validator.py'
155194
// sh 'mkdir build'
156195
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
196+
// sh 'cd build && make check -j4 || true'
197+
// sh 'cd build && make install'
198+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
199+
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
200+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
157201
// }
158202
// }
159203
// end gcc builds
@@ -252,11 +296,11 @@ pipeline {
252296
}
253297

254298
// Process test results from the first build stage
255-
post {
256-
always {
257-
dir("${WORKSPACE}/../builds/${BUILD_ID}") {
258-
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]]])
259-
}
260-
}
261-
}
299+
// post {
300+
// always {
301+
// dir("${WORKSPACE}/../builds/${BUILD_ID}") {
302+
// 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]]])
303+
// }
304+
// }
305+
// }
262306
}

‎cmake/External/capnproto.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ if (NOT __CAPNP_INCLUDED) # guard against multiple includes
2020
set(CAPNP_EXTRA_COMPILER_FLAGS "-fPIC")
2121
endif()
2222

23-
set(CAPNP_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS})
24-
set(CAPNP_C_FLAGS ${CMAKE_C_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS})
23+
set(CAPNP_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS}")
24+
set(CAPNP_C_FLAGS "${CMAKE_C_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS}")
2525

2626
ExternalProject_Add(capnp
2727
PREFIX ${capnp_PREFIX}

‎cmake/External/gflags.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ if (NOT __GFLAGS_INCLUDED) # guard against multiple includes
2020
set(GFLAGS_EXTRA_COMPILER_FLAGS "-fPIC")
2121
endif()
2222

23-
set(GFLAGS_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS})
24-
set(GFLAGS_C_FLAGS ${CMAKE_C_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS})
23+
set(GFLAGS_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS}")
24+
set(GFLAGS_C_FLAGS "${CMAKE_C_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS}")
2525

2626
ExternalProject_Add(gflags
2727
PREFIX ${gflags_PREFIX}

‎cmake/External/glog.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ if (NOT __GLOG_INCLUDED)
2222
set(GLOG_EXTRA_COMPILER_FLAGS "-fPIC")
2323
endif()
2424

25-
set(GLOG_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS})
26-
set(GLOG_C_FLAGS ${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS})
25+
set(GLOG_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
26+
set(GLOG_C_FLAGS "${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
2727

2828
# depend on gflags if we're also building it
2929
if (GFLAGS_EXTERNAL)

‎script/docker/centos7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN yum -q -y install sudo wget
66

77
RUN /bin/bash -c "source ./peloton/script/installation/packages.sh"
88

9-
RUN mkdir /peloton/build && cd /peloton/build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install
9+
RUN mkdir /peloton/build && cd /peloton/build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install
1010

1111
ENV PATH=$(BUILD_DIR)/bin:$PATH
1212
ENV LD_LIBRARY_PATH=$(BUILD_DIR)/lib:$LD_LIBRARY_PATH

‎script/docker/centos7/Dockerfile-jenkins

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ RUN yum -q -y install sudo wget clang
77
RUN /bin/bash -c "source ./peloton/script/installation/packages.sh"
88

99
RUN echo -n "Peloton Debug build with "; g++ --version | head -1
10-
RUN mkdir /peloton/build && cd /peloton/build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install
10+
RUN mkdir /peloton/build && cd /peloton/build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install
1111

1212
RUN echo -n "Peloton Release build with "; g++ --version | head -1
13-
RUN rm -rf /peloton/build && mkdir /peloton/build && cd /peloton/build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install
13+
RUN rm -rf /peloton/build && mkdir /peloton/build && cd /peloton/build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install
1414

1515
RUN echo -n "Peloton Debug build with "; clang++ --version | head -1
16-
RUN rm -rf /peloton/build && mkdir /peloton/build && cd /peloton/build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install
16+
RUN rm -rf /peloton/build && mkdir /peloton/build && cd /peloton/build && CC=clang CXX=clang++ cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install
1717

1818
RUN echo -n "Peloton Release build with "; clang++ --version | head -1
19-
RUN rm -rf /peloton/build && mkdir /peloton/build && cd /peloton/build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install
19+
RUN rm -rf /peloton/build && mkdir /peloton/build && cd /peloton/build && CC=clang CXX=clang++ cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install

‎script/installation/packages.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
163163
${LLVM}-static \
164164
libedit-devel \
165165
postgresql \
166+
libasan \
167+
libtsan \
168+
libubsan \
166169
libatomic
167170

168171
## ------------------------------------------------

0 commit comments

Comments
 (0)