Skip to content

Commit

Permalink
move cobertura to buildtests
Browse files Browse the repository at this point in the history
  • Loading branch information
jredbeard committed Jul 27, 2018
1 parent d05d071 commit 86dea5e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pipeline {
parallel ( "Build tests":
{
sh 'ciscripts/triggertests.sh'
step([$class: 'CoberturaPublisher', autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: '**/cobertura/coverage.xml', failUnhealthy: false, failUnstable: false, maxNumberOfBuilds: 0, onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false])
},
"Build docker image": {
sh 'ciscripts/triggerbuild.sh'
Expand Down
2 changes: 0 additions & 2 deletions ciscripts/buildscript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ fi
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
cp -r /var/jenkins_home/cobertura .
4 changes: 3 additions & 1 deletion ciscripts/buildtests.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash
set -e
sudo docker build --build-arg BUILD_STEP=1 -t=steemit/steem:tests .
sudo docker build --build-arg BUILD_STEP=1 -t=steemit/steem:tests .
sudo docker run -v $WORKSPACE:/var/jenkins steemit/steem:tests cp -r /var/cobertura /var/jenkins
cp -r $WORKSPACE/cobertura .

0 comments on commit 86dea5e

Please sign in to comment.