Skip to content

Commit

Permalink
add dockerfile build steps and jenkinsfile parallel
Browse files Browse the repository at this point in the history
  • Loading branch information
jredbeard committed Jul 26, 2018
1 parent ca1d3ac commit 567f6d6
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 6 deletions.
18 changes: 14 additions & 4 deletions Dockerfile
Expand Up @@ -4,6 +4,8 @@ FROM phusion/baseimage:0.9.19

ARG STEEM_STATIC_BUILD=ON
ENV STEEM_STATIC_BUILD ${STEEM_STATIC_BUILD}
ARG BUILD_STEP
ENV BUILD_STEP ${BUILD_STEP}

ENV LANG=en_US.UTF-8

Expand Down Expand Up @@ -51,6 +53,7 @@ RUN \
ADD . /usr/local/src/steem

RUN \
if [ "$BUILD_STEP" = "1" ] || [ ! "$BUILD_STEP" ] ; then \
cd /usr/local/src/steem && \
git submodule update --init --recursive && \
mkdir build && \
Expand All @@ -71,9 +74,11 @@ RUN \
PYTHONPATH=programs/build_helpers \
python3 -m steem_build_helpers.check_reflect && \
programs/build_helpers/get_config_check.sh && \
rm -rf /usr/local/src/steem/build
rm -rf /usr/local/src/steem/build ; \
fi

RUN \
if [ "$BUILD_STEP" = "2" ] || [ ! "$BUILD_STEP" ] ; then \
cd /usr/local/src/steem && \
git submodule update --init --recursive && \
mkdir build && \
Expand All @@ -98,9 +103,11 @@ RUN \
PYTHONPATH=programs/build_helpers \
python3 -m steem_build_helpers.check_reflect && \
programs/build_helpers/get_config_check.sh && \
rm -rf /usr/local/src/steem/build
rm -rf /usr/local/src/steem/build ; \
fi

RUN \
if [ "$BUILD_STEP" = "1" ] || [ ! "$BUILD_STEP" ] ; then \
cd /usr/local/src/steem && \
git submodule update --init --recursive && \
mkdir build && \
Expand All @@ -120,9 +127,11 @@ RUN \
mkdir -p /var/cobertura && \
gcovr --object-directory="../" --root=../ --xml-pretty --gcov-exclude=".*tests.*" --gcov-exclude=".*fc.*" --gcov-exclude=".*app*" --gcov-exclude=".*net*" --gcov-exclude=".*plugins*" --gcov-exclude=".*schema*" --gcov-exclude=".*time*" --gcov-exclude=".*utilities*" --gcov-exclude=".*wallet*" --gcov-exclude=".*programs*" --output="/var/cobertura/coverage.xml" && \
cd /usr/local/src/steem && \
rm -rf /usr/local/src/steem/build
rm -rf /usr/local/src/steem/build ; \
fi

RUN \
if [ "$BUILD_STEP" = "2" ] || [ ! "$BUILD_STEP" ] ; then \
cd /usr/local/src/steem && \
git submodule update --init --recursive && \
mkdir build && \
Expand Down Expand Up @@ -162,7 +171,8 @@ RUN \
&& \
make -j$(nproc) && \
make install && \
rm -rf /usr/local/src/steem
rm -rf /usr/local/src/steem ; \
fi

RUN \
apt-get remove -y \
Expand Down
12 changes: 11 additions & 1 deletion Jenkinsfile
Expand Up @@ -4,7 +4,17 @@ pipeline {
stages {
stage('Build') {
steps {
sh 'ciscripts/triggerbuild.sh'
parallel ( "Build tests":
{
node {
sh 'ciscripts/triggertests.sh'
}
},
"Build docker image": {
node {
sh 'ciscripts/triggerbuild.sh'
}
})
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ciscripts/buildscript.sh
Expand Up @@ -4,7 +4,7 @@ export IMAGE_NAME="steemit/steem:$BRANCH_NAME"
if [[ $IMAGE_NAME == "steemit/steem:stable" ]] ; then
IMAGE_NAME="steemit/steem:latest"
fi
sudo docker build -t=$IMAGE_NAME .
sudo docker build --build-arg BUILD_STEP=2 -t=$IMAGE_NAME .
sudo docker login --username=$DOCKER_USER --password=$DOCKER_PASS
sudo docker push $IMAGE_NAME
sudo docker run -v /var/jenkins_home:/var/jenkins $IMAGE_NAME cp -r /var/cobertura /var/jenkins
Expand Down
3 changes: 3 additions & 0 deletions ciscripts/buildtests.sh
@@ -0,0 +1,3 @@
#!/bin/bash
set -e
sudo docker build --build-arg BUILD_STEP=1 -t=steemit/steem:tests .
8 changes: 8 additions & 0 deletions ciscripts/triggertests.sh
@@ -0,0 +1,8 @@
#!/bin/bash
set -e
if /bin/bash $WORKSPACE/ciscripts/buildtests.sh; then
echo BUILD SUCCESS
else
echo BUILD FAILURE
exit 1
fi

0 comments on commit 567f6d6

Please sign in to comment.