Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f0c93cb

Browse files
jgaajgaa
committedOct 30, 2020
Fixing builds
1 parent 790358b commit f0c93cb

File tree

4 files changed

+71
-71
lines changed

4 files changed

+71
-71
lines changed
 

‎ci/jenkins/Dockefile.debian-buster

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
77
DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
88
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q \
99
openssh-server g++ git \
10-
automake autoconf ruby ruby-dev rubygems build-essential \
10+
build-essential \
1111
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
1212
default-jdk &&\
13-
gem install --no-ri --no-rdoc fpm &&\
1413
apt-get -y -q autoremove &&\
1514
apt-get -y -q clean
1615

‎ci/jenkins/Dockefile.debian-testing

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ FROM debian:testing
33
MAINTAINER Jarle Aase <jgaa@jgaa.com>
44

55
# In case you need proxy
6-
RUN apt-get -q update &&\
7-
apt-get -y -q --no-install-recommends upgrade &&\
8-
apt-get -y -q install openssh-server g++ git \
9-
git build-essential \
6+
RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
7+
DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
8+
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q\
9+
openssh-server g++ git \
10+
build-essential \
1011
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
1112
default-jdk &&\
1213
apt-get -y -q autoremove &&\

‎ci/jenkins/Dockerfile.debian-stretch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM debian:stretch
22

33
MAINTAINER Jarle Aase <jgaa@jgaa.com>
44

5-
# In case you need proxy
6-
RUN apt-get -q update &&\
7-
apt-get -y -q --no-install-recommends upgrade &&\
8-
apt-get -y -q install openssh-server g++ git \
9-
automake autoconf ruby ruby-dev rubygems build-essential \
5+
RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
6+
DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
7+
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q \
8+
openssh-server g++ git \
9+
build-essential \
1010
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
1111
openjdk-8-jdk &&\
1212
gem install --no-ri --no-rdoc fpm &&\

‎ci/jenkins/Jenkinsfile.groovy

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pipeline {
3737
// sh 'pwd; ls -la'
3838
// sh 'rm -rf build'
3939
// sh 'mkdir build'
40-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make'
40+
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
4141
//
4242
// echo 'Getting ready to run tests'
4343
// script {
@@ -66,64 +66,6 @@ pipeline {
6666
// sh 'pwd; ls -la'
6767
// sh 'rm -rf build'
6868
// sh 'mkdir build'
69-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make'
70-
//
71-
// echo 'Getting ready to run tests'
72-
// script {
73-
// try {
74-
// sh 'cd build && ctest --no-compress-output -T Test'
75-
// } catch (exc) {
76-
// echo 'Testing failed'
77-
// currentBuild.result = 'UNSTABLE'
78-
// }
79-
// }
80-
// }
81-
// }
82-
83-
// stage('Debian Stretch') {
84-
// agent {
85-
// dockerfile {
86-
// filename 'Dockerfile.debian-stretch'
87-
// dir 'ci/jenkins'
88-
// label 'docker'
89-
// }
90-
// }
91-
//
92-
// steps {
93-
// echo "Building on debian-stretch-AMD64 in ${WORKSPACE}"
94-
// checkout scm
95-
// sh 'pwd; ls -la'
96-
// sh 'rm -rf build'
97-
// sh 'mkdir build'
98-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make'
99-
//
100-
// echo 'Getting ready to run tests'
101-
// script {
102-
// try {
103-
// sh 'cd build && ctest --no-compress-output -T Test'
104-
// } catch (exc) {
105-
// echo 'Testing failed'
106-
// currentBuild.result = 'UNSTABLE'
107-
// }
108-
// }
109-
// }
110-
// }
111-
//
112-
// stage('Debian Buster') {
113-
// agent {
114-
// dockerfile {
115-
// filename 'Dockefile.debian-buster'
116-
// dir 'ci/jenkins'
117-
// label 'docker'
118-
// }
119-
// }
120-
//
121-
// steps {
122-
// echo "Building on debian-buster-AMD64 in ${WORKSPACE}"
123-
// checkout scm
124-
// sh 'pwd; ls -la'
125-
// sh 'rm -rf build'
126-
// sh 'mkdir build'
12769
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
12870
//
12971
// echo 'Getting ready to run tests'
@@ -138,6 +80,64 @@ pipeline {
13880
// }
13981
// }
14082

83+
stage('Debian Stretch') {
84+
agent {
85+
dockerfile {
86+
filename 'Dockerfile.debian-stretch'
87+
dir 'ci/jenkins'
88+
label 'docker'
89+
}
90+
}
91+
92+
steps {
93+
echo "Building on debian-stretch-AMD64 in ${WORKSPACE}"
94+
checkout scm
95+
sh 'pwd; ls -la'
96+
sh 'rm -rf build'
97+
sh 'mkdir build'
98+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
99+
100+
echo 'Getting ready to run tests'
101+
script {
102+
try {
103+
sh 'cd build && ctest --no-compress-output -T Test'
104+
} catch (exc) {
105+
echo 'Testing failed'
106+
currentBuild.result = 'UNSTABLE'
107+
}
108+
}
109+
}
110+
}
111+
112+
stage('Debian Buster') {
113+
agent {
114+
dockerfile {
115+
filename 'Dockefile.debian-buster'
116+
dir 'ci/jenkins'
117+
label 'docker'
118+
}
119+
}
120+
121+
steps {
122+
echo "Building on debian-buster-AMD64 in ${WORKSPACE}"
123+
checkout scm
124+
sh 'pwd; ls -la'
125+
sh 'rm -rf build'
126+
sh 'mkdir build'
127+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
128+
129+
echo 'Getting ready to run tests'
130+
script {
131+
try {
132+
sh 'cd build && ctest --no-compress-output -T Test'
133+
} catch (exc) {
134+
echo 'Testing failed'
135+
currentBuild.result = 'UNSTABLE'
136+
}
137+
}
138+
}
139+
}
140+
141141
stage('Debian Testing') {
142142
agent {
143143
dockerfile {
@@ -153,7 +153,7 @@ pipeline {
153153
sh 'pwd; ls -la'
154154
sh 'rm -rf build'
155155
sh 'mkdir build'
156-
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make'
156+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
157157

158158
echo 'Getting ready to run tests'
159159
script {

0 commit comments

Comments
 (0)
Please sign in to comment.