From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Tue, 1 Oct 2019 12:55:07 +0000 (+0200)
Subject: CI: test run
X-Git-Tag: v7.0.0rc1~11
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=0794a1adbc3245fb645ddfb965e64230b22ff2a6;p=osm%2Fvim-emu.git

CI: test run

Change-Id: I734954924c0c30d846f6a62a3900abcf9d6af69c
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>
---

diff --git a/Jenkinsfile b/Jenkinsfile
index 2a3164e..1659c6e 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"
@@ -59,9 +54,11 @@ node('docker') {
                            params.ARTIFACTORY_SERVER,
                           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 "docker images"
+        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'"
     }
 }