X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=Jenkinsfile;h=36156a72af8fb2c4d4b72cdb1d8bdf2b1d86b7d2;hp=6bb190f6fbee0643fd462a14655084f6f052b992;hb=1cb6e963396e6d5cc53f087cf7e13611e3e391f4;hpb=7f255b4330c4bb8ca93800729da81ddb028898c5

diff --git a/Jenkinsfile b/Jenkinsfile
index 6bb190f..36156a7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,20 +37,11 @@ def devops_checkout() {
     }
 }
 
+
 node('docker') {
     checkout scm
-
-    stage("Pre-Test") {
-        sh "docker build -t osm/vim-emu-pre-test ."
-    }
-    
     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"
@@ -63,4 +54,14 @@ node('docker') {
                            params.TEST_INSTALL,
                            params.ARTIFACTORY_SERVER,
                            docker_args)
+
+    // custom test stage that executes vim-emu's unit tests as root
+    // we cannot do this as part of the normal stage 2 since it would create
+    // files owned by root that could not be cleaned up.
+    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,devops,build,examples/charms --ignore=E501,W605,W504 ."
+        sh "echo 'done'"
+    }
 }