X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Jenkinsfile;h=dd118e5be1235067e04910a4d39b3ede115e4baf;hb=refs%2Fchanges%2F05%2F8005%2F2;hp=c81511abae36934ec2908f073434f2e6085c1ab8;hpb=dd4363bf001a11cfcdb735fdef470a9492f26c7a;p=osm%2Fvim-emu.git

diff --git a/Jenkinsfile b/Jenkinsfile
index c81511a..dd118e5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,21 +37,11 @@ def devops_checkout() {
     }
 }
 
+
 node('docker') {
     checkout scm
-
-    stage("Pre-Test") {
-        //sh "docker build -t osm/vim-emu-pre-test ."
-        sh "devops-stages/stage-pre-test.sh"
-    }
-    
     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"
@@ -64,4 +54,13 @@ 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 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'"
+    }
 }