Change in Jenkins file

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 1659c6e..a599ef1 100644 (file)
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,13 +52,15 @@ node('docker') {
                            params.GERRIT_PATCHSET_REVISION,
                            params.TEST_INSTALL,
                            params.ARTIFACTORY_SERVER,
                            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 "Running post-test stage"
 
     // custom test stage that executes vim-emu's unit tests as root
     stage("Post-Test") {
         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 "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'"
     }
 }
         sh "echo 'done'"
     }
 }

diff --git a/devops-stages/stage-pre-test.sh b/devops-stages/stage-pre-test.sh
deleted file mode 100644 (file)
index e25ebc8..0000000
--- a/devops-stages/stage-pre-test.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2015 SONATA-NFV and Paderborn University
-# ALL RIGHTS RESERVED.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Neither the name of the SONATA-NFV, Paderborn University
-# nor the names of its contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# This work has been performed in the framework of the SONATA project,
-# funded by the European Commission under Grant number 671517 through
-# the Horizon 2020 and 5G-PPP programmes. The authors would like to
-# acknowledge the contributions of their colleagues of the SONATA
-# partner consortium (www.sonata-nfv.eu).
-#
-# Runs the unittests of "vim-emu". Script needs to be executed inside
-# the vim-emu Docker container by user "root". It requires the container
-# to be started in privileged mode.
-#
-set -e
-echo "vim-emu stage-pre-test.sh"
-exit 1 # lets fail here
-
-
-
-
-# debugging
-echo "stage-test.sh executed inside: $(hostname)"
-echo "stage-test.sh executed by user: $(whoami)"
-# disable root-required test for now to play around some more.
-echo "Stopping early."
-exit 0
-
-# Attention: The following needs to be done as root
-# trigger ovs setup since container entrypoint is overwritten by Jenkins
-service openvswitch-switch start
-# ensure the Docker image used during the unittests is there
-docker pull 'ubuntu:trusty'
-
-cd /son-emu/
-# trigger pep8 style check
-echo "flake8 version:"
-flake8 --version
-echo "Doing flake8 style check ..."
-flake8 --exclude=.eggs,devops,build,examples/charms --ignore=E501,W605,W504 .
-echo "done."
-# trigger the tests
-echo "Running unit tests ..."
-pytest -v
-echo "done."
-
-
-