linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove bootstrapping code from Jenkinsfile

Browse Source 
Change-Id: I444509902b64b5112d3ca579a5217680b83e1614
Reviewed-on: https://forge.frm2.tum.de/review/18618
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
This commit is contained in:
Björn Pedersen 2018-08-13 14:26:32 +02:00 committed by Bjoern Pedersen
parent 8c5f602a99
commit 4b2260d77c
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ci/Jenkinsfile vendored
View File

@ -89,22 +89,17 @@ node("master") {
sh 'git show' sh 'git show'
} }
stage('(re-)generate image') { stage('(re-)generate image') {
try { sh '''#!/bin/bash
sh '''#!/bin/bash git worktree add tmpmaster origin/master
git worktree add tmpmaster refs/changes/17/18617/8
cd tmpmaster cd tmpmaster
docker build --target base --tag jenkinsng.admin.frm2:5000/secop_base:latest \ docker build --target base --tag secop_base:latest ci
--tag secop_base:latest ci
cd .. cd ..
rm -rf tmpmaster rm -rf tmpmaster
''' '''
} catch (all) {
}
} }
stage('execute tests') { stage('execute tests') {
img = docker.image('jenkinsng.admin.frm2:5000/secop_base:latest') img = docker.image('secop_base:latest')
img.pull()
img.inside { img.inside {
run_tests('python2') run_tests('python2')
} }

3
ci/README
View File

@ -18,6 +18,3 @@ To test images interactivly:
The Jenkinsfile uses this Dockerfile (only approved checked-in versions from master) The Jenkinsfile uses this Dockerfile (only approved checked-in versions from master)
to build the images (a rebuild will only happen if the Dockerfile is changed as docker to build the images (a rebuild will only happen if the Dockerfile is changed as docker
caches the images and build information) and run the test suite inside the container. caches the images and build information) and run the test suite inside the container.
(Note: The initial version still has some bootstrapping glue, that will get
changed in a followup).