diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index fe54eaac..43f7fae5 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -89,22 +89,17 @@ node("master") { sh 'git show' } stage('(re-)generate image') { - try { - sh '''#!/bin/bash - git worktree add tmpmaster refs/changes/17/18617/8 + sh '''#!/bin/bash + git worktree add tmpmaster origin/master cd tmpmaster - docker build --target base --tag jenkinsng.admin.frm2:5000/secop_base:latest \ - --tag secop_base:latest ci + docker build --target base --tag secop_base:latest ci cd .. rm -rf tmpmaster ''' - } catch (all) { - } } stage('execute tests') { - img = docker.image('jenkinsng.admin.frm2:5000/secop_base:latest') - img.pull() + img = docker.image('secop_base:latest') img.inside { run_tests('python2') } diff --git a/ci/README b/ci/README index 38a72132..04178055 100644 --- a/ci/README +++ b/ci/README @@ -18,6 +18,3 @@ To test images interactivly: 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 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).