From 0794a1adbc3245fb645ddfb965e64230b22ff2a6 Mon Sep 17 00:00:00 2001 From: peusterm Date: Tue, 1 Oct 2019 14:55:07 +0200 Subject: [PATCH 1/1] CI: test run Change-Id: I734954924c0c30d846f6a62a3900abcf9d6af69c Signed-off-by: peusterm --- Jenkinsfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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'" } } -- 2.17.1