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

Commit 401b98f

Browse files
author
Chad Dougherty
committed
changes requested in #1169 
1 parent 1359dfc commit 401b98f

File tree

1 file changed

+113
-69
lines changed

1 file changed

+113
-69
lines changed

‎Jenkinsfile

Lines changed: 113 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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'
@@ -16,10 +16,9 @@ pipeline {
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,96 +33,126 @@ 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)') {
41-
agent { docker { image 'ubuntu:trusty' } }
42-
steps {
43-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
44-
sh 'python ./script/validators/source_validator.py'
45-
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'
54-
}
55-
}
56-
57-
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Release)') {
44+
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Debug)') {
5845
agent { docker { image 'ubuntu:trusty' } }
5946
steps {
6047
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
6148
sh 'python ./script/validators/source_validator.py'
6249
sh 'mkdir build'
63-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
50+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
6451
sh 'cd build && make check -j4 || true'
65-
// sh 'cd build && cp -pr test /job/'
66-
sh 'cd build && make benchmark -j4'
6752
sh 'cd build && make install'
6853
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
6954
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
7055
sh 'cd build && python ../script/validators/jdbc_validator.py'
7156
}
7257
}
7358

74-
stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Debug/Test)') {
75-
agent { docker { image 'debian:stretch' } }
59+
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Release)') {
60+
agent { docker { image 'ubuntu:trusty' } }
7661
steps {
7762
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
7863
sh 'python ./script/validators/source_validator.py'
7964
sh 'mkdir build'
80-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False -DUSE_SANITIZER=Address .. && make -j4'
65+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
8166
sh 'cd build && make check -j4 || true'
82-
sh 'cd build && make benchmark -j4'
8367
sh 'cd build && make install'
8468
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
8569
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
8670
sh 'cd build && python ../script/validators/jdbc_validator.py'
8771
}
8872
}
8973

90-
stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Release)') {
91-
agent { docker { image 'debian:stretch' } }
74+
stage('Ubuntu Xenial/gcc-5.4.0/llvm-3.7.1 (LOG_LEVEL_TRACE)') {
75+
agent { docker { image 'ubuntu:xenial' } }
9276
steps {
9377
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
9478
sh 'python ./script/validators/source_validator.py'
9579
sh 'mkdir build'
96-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
80+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCMAKE_CXX_FLAGS="-DLOG_LEVEL=LOG_LEVEL_TRACE" -DCOVERALLS=False .. && make -j4'
9781
}
9882
}
9983

100-
stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Debug)') {
101-
agent { docker { image 'fedora:26' } }
102-
steps {
103-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
104-
sh 'python ./script/validators/source_validator.py'
105-
sh 'mkdir build'
106-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
107-
}
108-
}
84+
// stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Debug)') {
85+
// agent { docker { image 'debian:stretch' } }
86+
// steps {
87+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
88+
// sh 'python ./script/validators/source_validator.py'
89+
// sh 'mkdir build'
90+
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
91+
// sh 'cd build && make check -j4 || true'
92+
// sh 'cd build && make install'
93+
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
94+
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
95+
// sh 'cd build && python ../script/validators/jdbc_validator.py'
96+
// }
97+
// }
10998

110-
stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Release)') {
111-
agent { docker { image 'fedora:26' } }
112-
steps {
113-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
114-
sh 'python ./script/validators/source_validator.py'
115-
sh 'mkdir build'
116-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
117-
}
118-
}
99+
// stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Release)') {
100+
// agent { docker { image 'debian:stretch' } }
101+
// steps {
102+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
103+
// sh 'python ./script/validators/source_validator.py'
104+
// sh 'mkdir build'
105+
// 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'
111+
// }
112+
// }
113+
114+
// stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Debug)') {
115+
// agent { docker { image 'fedora:26' } }
116+
// steps {
117+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
118+
// sh 'python ./script/validators/source_validator.py'
119+
// sh 'mkdir build'
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'
126+
// }
127+
// }
128+
129+
// stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Release)') {
130+
// agent { docker { image 'fedora:26' } }
131+
// steps {
132+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
133+
// sh 'python ./script/validators/source_validator.py'
134+
// sh 'mkdir build'
135+
// 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'
141+
// }
142+
// }
119143

120144
stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
121145
agent { docker { image 'fedora:27' } }
122146
steps {
123147
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
124148
sh 'python ./script/validators/source_validator.py'
125149
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'
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'
127156
}
128157
}
129158

@@ -134,28 +163,43 @@ pipeline {
134163
sh 'python ./script/validators/source_validator.py'
135164
sh 'mkdir build'
136165
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'
137171
}
138172
}
139173

140-
stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
141-
agent { docker { image 'centos:7' } }
142-
steps {
143-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
144-
sh 'python ./script/validators/source_validator.py'
145-
sh 'mkdir build'
146-
sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
147-
}
148-
}
174+
// stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
175+
// agent { docker { image 'centos:7' } }
176+
// steps {
177+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
178+
// sh 'python ./script/validators/source_validator.py'
179+
// sh 'mkdir build'
180+
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -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'
186+
// }
187+
// }
149188

150-
stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Release)') {
151-
agent { docker { image 'centos:7' } }
152-
steps {
153-
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
154-
sh 'python ./script/validators/source_validator.py'
155-
sh 'mkdir build'
156-
sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
157-
}
158-
}
189+
// stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Release)') {
190+
// agent { docker { image 'centos:7' } }
191+
// steps {
192+
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
193+
// sh 'python ./script/validators/source_validator.py'
194+
// sh 'mkdir build'
195+
// 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'
201+
// }
202+
// }
159203
// end gcc builds
160204

161205
// begin clang builds

0 commit comments

Comments
 (0)