X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=Jenkinsfile;h=a599ef101a0879f38f82723db82b31340fd76a56;hp=2a3164e42ede03e0be44a284489355a23ea4bf66;hb=8b789997de031bade6511f44aeee8fe4055f0e5a;hpb=af04f9735d519cf9aa49f0a1625c59f48c33ba0b diff --git a/Jenkinsfile b/Jenkinsfile index 2a3164e..a599ef1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,11 +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" - - // call the normal OSM devops jobs (without root rights) docker_args = "" ci_helper = load "devops/jenkins/ci-pipelines/ci_stage_2.groovy" @@ -57,11 +52,15 @@ 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 "docker build -t osm/vim-emu-pre-test ." - //sh "devops-stages/stage-pre-test.sh" + sh "Running post-test stage" sh "docker images" + sh "docker run --rm osm/vim-emu-master ls -l" + //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'" } }