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 1ee1812

Browse files
committedJan 19, 2019
Adding build for Ubuntu bionic
1 parent 7ce29c6 commit 1ee1812

File tree

2 files changed

+86
-31
lines changed

2 files changed

+86
-31
lines changed
 

‎ci/jenkins/Dockefile.ubuntu-bionic

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM ubuntu:bionic
2+
3+
MAINTAINER Jarle Aase <jgaa@jgaa.com>
4+
5+
# In case you need proxy
6+
#RUN echo 'Acquire::http::Proxy "http://127.0.0.1:8080";' >> /etc/apt/apt.conf
7+
8+
RUN apt-get -q update &&\
9+
apt-get -y -q --no-install-recommends upgrade &&\
10+
apt-get -y -q install openssh-server g++ git \
11+
automake autoconf ruby ruby-dev rubygems build-essential \
12+
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
13+
openjdk-8-jdk &&\
14+
gem install --no-ri --no-rdoc fpm &&\
15+
apt-get -y -q autoremove &&\
16+
apt-get -y -q clean
17+
18+
# Set user jenkins to the image
19+
RUN useradd -m -d /home/jenkins -s /bin/sh jenkins &&\
20+
echo "jenkins:jenkins" | chpasswd
21+
22+
# Standard SSH port
23+
EXPOSE 22
24+
25+
# Default command
26+
CMD ["/usr/sbin/sshd", "-D"]

‎ci/jenkins/Jenkinsfile.groovy

Lines changed: 60 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,35 @@ pipeline {
2121

2222
stage('Build') {
2323
parallel {
24+
stage('Ubuntu Bionic') {
25+
agent {
26+
dockerfile {
27+
filename 'Dockefile.ubuntu-bionic'
28+
dir 'ci/jenkins'
29+
label 'master'
30+
}
31+
}
32+
33+
steps {
34+
echo "Building on ubuntu-bionic-AMD64 in ${WORKSPACE}"
35+
checkout scm
36+
sh 'pwd; ls -la'
37+
sh 'rm -rf build'
38+
sh 'mkdir build'
39+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make'
40+
41+
echo 'Getting ready to run tests'
42+
script {
43+
try {
44+
sh 'cd build && ctest --no-compress-output -T Test'
45+
} catch (exc) {
46+
echo 'Testing failed'
47+
currentBuild.result = 'UNSTABLE'
48+
}
49+
}
50+
}
51+
}
52+
//
2453
// stage('Ubuntu Xenial') {
2554
// agent {
2655
// dockerfile {
@@ -49,7 +78,7 @@ pipeline {
4978
// }
5079
// }
5180
// }
52-
//
81+
//
5382
// stage('Debian Stretch') {
5483
// agent {
5584
// dockerfile {
@@ -136,36 +165,36 @@ pipeline {
136165
// }
137166
// }
138167
// }
139-
140-
stage('Centos7') {
141-
agent {
142-
dockerfile {
143-
filename 'Dockerfile.centos7'
144-
dir 'ci/jenkins'
145-
label 'master'
146-
}
147-
}
148-
149-
steps {
150-
echo "Building on Centos7 in ${WORKSPACE}"
151-
checkout scm
152-
sh 'pwd; ls -la'
153-
sh 'rm -rf build'
154-
sh 'mkdir build'
155-
sh 'cd build && source scl_source enable devtoolset-7 && cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=/opt/boost .. && make'
156-
157-
echo 'Getting ready to run tests'
158-
script {
159-
try {
160-
sh 'cd build && ctest --no-compress-output -T Test'
161-
} catch (exc) {
162-
echo 'Testing failed'
163-
currentBuild.result = 'UNSTABLE'
164-
}
165-
}
166-
}
167-
}
168-
168+
//
169+
// stage('Centos7') {
170+
// agent {
171+
// dockerfile {
172+
// filename 'Dockerfile.centos7'
173+
// dir 'ci/jenkins'
174+
// label 'master'
175+
// }
176+
// }
177+
//
178+
// steps {
179+
// echo "Building on Centos7 in ${WORKSPACE}"
180+
// checkout scm
181+
// sh 'pwd; ls -la'
182+
// sh 'rm -rf build'
183+
// sh 'mkdir build'
184+
// sh 'cd build && source scl_source enable devtoolset-7 && cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=/opt/boost .. && make'
185+
//
186+
// echo 'Getting ready to run tests'
187+
// script {
188+
// try {
189+
// sh 'cd build && ctest --no-compress-output -T Test'
190+
// } catch (exc) {
191+
// echo 'Testing failed'
192+
// currentBuild.result = 'UNSTABLE'
193+
// }
194+
// }
195+
// }
196+
// }
197+
//
169198
// stage('macOS') {
170199
// agent {label 'macos'}
171200
//

0 commit comments

Comments
 (0)
Please sign in to comment.