X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Jenkinsfile;h=31e1f637a0d7104116682929f011be4320b97d50;hb=refs%2Fchanges%2F06%2F8006%2F2;hp=c314ea1075502e911dfb058b371e1fd0852b0b8c;hpb=04dfa0a56895f0b28cb449fe546733d6e3fa6be5;p=osm%2Fvim-emu.git diff --git a/Jenkinsfile b/Jenkinsfile index c314ea1..31e1f63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,12 +41,6 @@ node('docker') { checkout scm devops_checkout() - // vim-emu: We need to use privileged mode, docker.sock, and host pids for the container - // to test the emulator. Also needs -u 0:0 (root user inside container). - //docker_args = "--privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock -u 0:0" - # TODO run the custom tests here - - // call the normal OSM devops jobs (without root rights) docker_args = "" ci_helper = load "devops/jenkins/ci-pipelines/ci_stage_2.groovy" @@ -59,4 +53,12 @@ node('docker') { params.TEST_INSTALL, params.ARTIFACTORY_SERVER, docker_args) + + // custom test stage that executes vim-emu's unit tests as root + stage("Post-Test") { + sh "docker images" + sh "docker run --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock -u 0:0 osm/vim-emu-master pytest -v" + sh "docker run --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock -u 0:0 osm/vim-emu-master flake8 --exclude=.eggs,devopsi,build,examples/charms --ignore=E501,W605,W504 ." + sh "echo 'done'" + } }