X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=Jenkinsfile;h=1659c6e20f88a3160a74c9d42e2654197b85b417;hp=5a9d85a88f580d9ace05dc58728a4195b2949cd6;hb=0794a1adbc3245fb645ddfb965e64230b22ff2a6;hpb=102d7268b0f64ecdf9c88c0a8b93c54dea1dd908 diff --git a/Jenkinsfile b/Jenkinsfile index 5a9d85a..1659c6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,10 +41,8 @@ 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" - + // call the normal OSM devops jobs (without root rights) + docker_args = "" ci_helper = load "devops/jenkins/ci-pipelines/ci_stage_2.groovy" ci_helper.ci_pipeline( 'vim-emu', params.PROJECT_URL_PREFIX, @@ -54,5 +52,13 @@ node('docker') { params.GERRIT_PATCHSET_REVISION, params.TEST_INSTALL, params.ARTIFACTORY_SERVER, - docker_args) + docker_args) + + // custom test stage that executes vim-emu's unit tests as root + stage("Post-Test") { + sh "Running post-test stage" + sh "docker run --rm --privileged --pid='host' -u 0:0 -v /var/run/docker.sock:/var/run/docker.sock osm/vim-emu-master pytest -v" + sh "docker run --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock osm/vim-emu-master flake8 --exclude=.eggs,devopsi,build,examples/charms --ignore=E501,W605,W504 ." + sh "echo 'done'" + } }