]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
tests/packaging: rename packaging file directories to .packaging
authorTomas Krizek <tomas.krizek@nic.cz>
Mon, 18 May 2020 08:21:06 +0000 (10:21 +0200)
committerTomas Krizek <tomas.krizek@nic.cz>
Wed, 27 May 2020 08:12:41 +0000 (10:12 +0200)
148 files changed:
client/.packaging/test.sh [moved from client/packaging/test.sh with 100% similarity]
daemon/.packaging/centos/7/builddeps [moved from daemon/packaging/centos/7/builddeps with 100% similarity]
daemon/.packaging/centos/7/pre-build.sh [moved from daemon/packaging/centos/7/pre-build.sh with 100% similarity]
daemon/.packaging/centos/7/pre-run.sh [moved from daemon/packaging/centos/7/pre-run.sh with 100% similarity]
daemon/.packaging/centos/7/rundeps [moved from daemon/packaging/centos/7/rundeps with 100% similarity]
daemon/.packaging/debian/10/builddeps [moved from daemon/packaging/debian/10/builddeps with 100% similarity]
daemon/.packaging/debian/10/pre-build.sh [moved from daemon/packaging/debian/10/pre-build.sh with 100% similarity]
daemon/.packaging/debian/10/pre-run.sh [moved from daemon/packaging/debian/10/pre-run.sh with 100% similarity]
daemon/.packaging/debian/10/rundeps [moved from daemon/packaging/debian/10/rundeps with 100% similarity]
daemon/.packaging/debian/9/builddeps [moved from daemon/packaging/debian/9/builddeps with 100% similarity]
daemon/.packaging/debian/9/pre-build.sh [moved from daemon/packaging/debian/9/pre-build.sh with 100% similarity]
daemon/.packaging/debian/9/pre-run.sh [moved from daemon/packaging/debian/9/pre-run.sh with 100% similarity]
daemon/.packaging/debian/9/rundeps [moved from daemon/packaging/debian/9/rundeps with 100% similarity]
daemon/.packaging/fedora/30/builddeps [moved from daemon/packaging/fedora/30/builddeps with 100% similarity]
daemon/.packaging/fedora/30/pre-build.sh [moved from daemon/packaging/fedora/30/pre-build.sh with 100% similarity]
daemon/.packaging/fedora/30/pre-run.sh [moved from daemon/packaging/fedora/30/pre-run.sh with 100% similarity]
daemon/.packaging/fedora/30/rundeps [moved from daemon/packaging/fedora/30/rundeps with 100% similarity]
daemon/.packaging/fedora/31/builddeps [moved from daemon/packaging/fedora/31/builddeps with 100% similarity]
daemon/.packaging/fedora/31/pre-build.sh [moved from daemon/packaging/fedora/31/pre-build.sh with 100% similarity]
daemon/.packaging/fedora/31/pre-run.sh [moved from daemon/packaging/fedora/31/pre-run.sh with 100% similarity]
daemon/.packaging/fedora/31/rundeps [moved from daemon/packaging/fedora/31/rundeps with 100% similarity]
daemon/.packaging/leap/15.2/builddeps [moved from daemon/packaging/leap/15.2/builddeps with 100% similarity]
daemon/.packaging/leap/15.2/pre-build.sh [moved from daemon/packaging/leap/15.2/pre-build.sh with 100% similarity]
daemon/.packaging/leap/15.2/pre-run.sh [moved from daemon/packaging/leap/15.2/pre-run.sh with 100% similarity]
daemon/.packaging/leap/15.2/rundeps [moved from daemon/packaging/leap/15.2/rundeps with 100% similarity]
daemon/.packaging/leap/docker-image-name [moved from daemon/packaging/leap/docker-image-name with 100% similarity]
daemon/.packaging/test.config [moved from daemon/packaging/test.config with 100% similarity]
daemon/.packaging/ubuntu/16.04/builddeps [moved from daemon/packaging/ubuntu/16.04/builddeps with 100% similarity]
daemon/.packaging/ubuntu/16.04/pre-build.sh [moved from daemon/packaging/ubuntu/16.04/pre-build.sh with 100% similarity]
daemon/.packaging/ubuntu/16.04/pre-run.sh [moved from daemon/packaging/ubuntu/16.04/pre-run.sh with 100% similarity]
daemon/.packaging/ubuntu/16.04/rundeps [moved from daemon/packaging/ubuntu/16.04/rundeps with 100% similarity]
daemon/.packaging/ubuntu/18.04/builddeps [moved from daemon/packaging/ubuntu/18.04/builddeps with 100% similarity]
daemon/.packaging/ubuntu/18.04/pre-build.sh [moved from daemon/packaging/ubuntu/18.04/pre-build.sh with 100% similarity]
daemon/.packaging/ubuntu/18.04/pre-run.sh [moved from daemon/packaging/ubuntu/18.04/pre-run.sh with 100% similarity]
daemon/.packaging/ubuntu/18.04/rundeps [moved from daemon/packaging/ubuntu/18.04/rundeps with 100% similarity]
doc/.packaging/centos/7/NOTSUPPORTED [moved from doc/packaging/centos/7/NOTSUPPORTED with 100% similarity]
doc/.packaging/debian/10/build.sh [moved from doc/packaging/debian/10/build.sh with 100% similarity]
doc/.packaging/debian/10/builddeps [moved from doc/packaging/debian/10/builddeps with 100% similarity]
doc/.packaging/debian/10/install.sh [moved from doc/packaging/debian/10/install.sh with 100% similarity]
doc/.packaging/debian/9/build.sh [moved from doc/packaging/debian/9/build.sh with 100% similarity]
doc/.packaging/debian/9/builddeps [moved from doc/packaging/debian/9/builddeps with 100% similarity]
doc/.packaging/debian/9/install.sh [moved from doc/packaging/debian/9/install.sh with 100% similarity]
doc/.packaging/fedora/30/build.sh [moved from doc/packaging/fedora/30/build.sh with 100% similarity]
doc/.packaging/fedora/30/builddeps [moved from doc/packaging/fedora/30/builddeps with 100% similarity]
doc/.packaging/fedora/30/install.sh [moved from doc/packaging/fedora/30/install.sh with 100% similarity]
doc/.packaging/fedora/31/build.sh [moved from doc/packaging/fedora/31/build.sh with 100% similarity]
doc/.packaging/fedora/31/builddeps [moved from doc/packaging/fedora/31/builddeps with 100% similarity]
doc/.packaging/fedora/31/install.sh [moved from doc/packaging/fedora/31/install.sh with 100% similarity]
doc/.packaging/leap/15.2/build.sh [moved from doc/packaging/leap/15.2/build.sh with 100% similarity]
doc/.packaging/leap/15.2/builddeps [moved from doc/packaging/leap/15.2/builddeps with 100% similarity]
doc/.packaging/leap/15.2/install.sh [moved from doc/packaging/leap/15.2/install.sh with 100% similarity]
doc/.packaging/test.sh [moved from doc/packaging/test.sh with 100% similarity]
doc/.packaging/ubuntu/16.04/build.sh [moved from doc/packaging/ubuntu/16.04/build.sh with 100% similarity]
doc/.packaging/ubuntu/16.04/builddeps [moved from doc/packaging/ubuntu/16.04/builddeps with 100% similarity]
doc/.packaging/ubuntu/16.04/install.sh [moved from doc/packaging/ubuntu/16.04/install.sh with 100% similarity]
doc/.packaging/ubuntu/18.04/build.sh [moved from doc/packaging/ubuntu/18.04/build.sh with 100% similarity]
doc/.packaging/ubuntu/18.04/builddeps [moved from doc/packaging/ubuntu/18.04/builddeps with 100% similarity]
doc/.packaging/ubuntu/18.04/install.sh [moved from doc/packaging/ubuntu/18.04/install.sh with 100% similarity]
modules/bogus_log/.packaging/test.config [moved from modules/bogus_log/packaging/test.config with 100% similarity]
modules/daf/.packaging/test.config [moved from modules/daf/packaging/test.config with 100% similarity]
modules/detect_time_jump/.packaging/test.config [moved from modules/detect_time_jump/packaging/test.config with 100% similarity]
modules/detect_time_skew/.packaging/test.config [moved from modules/detect_time_skew/packaging/test.config with 100% similarity]
modules/dns64/.packaging/test.config [moved from modules/dns64/packaging/test.config with 100% similarity]
modules/dnstap/.packaging/centos/7/builddeps [moved from modules/dnstap/packaging/centos/7/builddeps with 100% similarity]
modules/dnstap/.packaging/centos/7/rundeps [moved from modules/dnstap/packaging/centos/7/rundeps with 100% similarity]
modules/dnstap/.packaging/debian/10/builddeps [moved from modules/dnstap/packaging/debian/10/builddeps with 100% similarity]
modules/dnstap/.packaging/debian/10/rundeps [moved from modules/dnstap/packaging/debian/10/rundeps with 100% similarity]
modules/dnstap/.packaging/debian/9/builddeps [moved from modules/dnstap/packaging/debian/9/builddeps with 100% similarity]
modules/dnstap/.packaging/debian/9/rundeps [moved from modules/dnstap/packaging/debian/9/rundeps with 100% similarity]
modules/dnstap/.packaging/fedora/30/builddeps [moved from modules/dnstap/packaging/fedora/30/builddeps with 100% similarity]
modules/dnstap/.packaging/fedora/30/rundeps [moved from modules/dnstap/packaging/fedora/30/rundeps with 100% similarity]
modules/dnstap/.packaging/fedora/31/builddeps [moved from modules/dnstap/packaging/fedora/31/builddeps with 100% similarity]
modules/dnstap/.packaging/fedora/31/rundeps [moved from modules/dnstap/packaging/fedora/31/rundeps with 100% similarity]
modules/dnstap/.packaging/leap/15.2/builddeps [moved from modules/dnstap/packaging/leap/15.2/builddeps with 100% similarity]
modules/dnstap/.packaging/leap/15.2/rundeps [moved from modules/dnstap/packaging/leap/15.2/rundeps with 100% similarity]
modules/dnstap/.packaging/test.config [moved from modules/dnstap/packaging/test.config with 100% similarity]
modules/dnstap/.packaging/ubuntu/16.04/builddeps [moved from modules/dnstap/packaging/ubuntu/16.04/builddeps with 100% similarity]
modules/dnstap/.packaging/ubuntu/16.04/rundeps [moved from modules/dnstap/packaging/ubuntu/16.04/rundeps with 100% similarity]
modules/dnstap/.packaging/ubuntu/18.04/builddeps [moved from modules/dnstap/packaging/ubuntu/18.04/builddeps with 100% similarity]
modules/dnstap/.packaging/ubuntu/18.04/rundeps [moved from modules/dnstap/packaging/ubuntu/18.04/rundeps with 100% similarity]
modules/edns_keepalive/.packaging/test.config [moved from modules/edns_keepalive/packaging/test.config with 100% similarity]
modules/etcd/.packaging/centos/7/pre-test.sh [moved from modules/etcd/packaging/centos/7/pre-test.sh with 100% similarity]
modules/etcd/.packaging/centos/7/rundeps [moved from modules/etcd/packaging/centos/7/rundeps with 100% similarity]
modules/etcd/.packaging/debian/10/pre-test.sh [moved from modules/etcd/packaging/debian/10/pre-test.sh with 100% similarity]
modules/etcd/.packaging/debian/10/rundeps [moved from modules/etcd/packaging/debian/10/rundeps with 100% similarity]
modules/etcd/.packaging/debian/9/pre-test.sh [moved from modules/etcd/packaging/debian/9/pre-test.sh with 100% similarity]
modules/etcd/.packaging/debian/9/rundeps [moved from modules/etcd/packaging/debian/9/rundeps with 100% similarity]
modules/etcd/.packaging/fedora/30/NOTSUPPORTED [moved from modules/etcd/packaging/fedora/30/NOTSUPPORTED with 100% similarity]
modules/etcd/.packaging/fedora/31/NOTSUPPORTED [moved from modules/etcd/packaging/fedora/31/NOTSUPPORTED with 100% similarity]
modules/etcd/.packaging/leap/15.2/pre-test.sh [moved from modules/etcd/packaging/leap/15.2/pre-test.sh with 100% similarity]
modules/etcd/.packaging/leap/15.2/rundeps [moved from modules/etcd/packaging/leap/15.2/rundeps with 100% similarity]
modules/etcd/.packaging/test.config [moved from modules/etcd/packaging/test.config with 100% similarity]
modules/etcd/.packaging/ubuntu/16.04/pre-test.sh [moved from modules/etcd/packaging/ubuntu/16.04/pre-test.sh with 100% similarity]
modules/etcd/.packaging/ubuntu/16.04/rundeps [moved from modules/etcd/packaging/ubuntu/16.04/rundeps with 100% similarity]
modules/etcd/.packaging/ubuntu/18.04/pre-test.sh [moved from modules/etcd/packaging/ubuntu/18.04/pre-test.sh with 100% similarity]
modules/etcd/.packaging/ubuntu/18.04/rundeps [moved from modules/etcd/packaging/ubuntu/18.04/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/centos/7/rundeps [moved from modules/experimental_dot_auth/packaging/centos/7/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/debian/10/rundeps [moved from modules/experimental_dot_auth/packaging/debian/10/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/debian/9/rundeps [moved from modules/experimental_dot_auth/packaging/debian/9/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/fedora/30/rundeps [moved from modules/experimental_dot_auth/packaging/fedora/30/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/fedora/31/rundeps [moved from modules/experimental_dot_auth/packaging/fedora/31/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/leap/15.2/NOTSUPPORTED [moved from modules/experimental_dot_auth/packaging/leap/15.2/NOTSUPPORTED with 100% similarity]
modules/experimental_dot_auth/.packaging/leap/15.2/pre-test.sh [moved from modules/experimental_dot_auth/packaging/leap/15.2/pre-test.sh with 100% similarity]
modules/experimental_dot_auth/.packaging/leap/15.2/rundeps [moved from modules/experimental_dot_auth/packaging/leap/15.2/rundeps with 100% similarity]
modules/experimental_dot_auth/.packaging/test.config [moved from modules/experimental_dot_auth/packaging/test.config with 100% similarity]
modules/experimental_dot_auth/.packaging/ubuntu/16.04/NOTSUPPORTED [moved from modules/experimental_dot_auth/packaging/ubuntu/16.04/NOTSUPPORTED with 100% similarity]
modules/experimental_dot_auth/.packaging/ubuntu/18.04/rundeps [moved from modules/experimental_dot_auth/packaging/ubuntu/18.04/rundeps with 100% similarity]
modules/graphite/.packaging/centos/7/rundeps [moved from modules/graphite/packaging/centos/7/rundeps with 100% similarity]
modules/graphite/.packaging/debian/10/rundeps [moved from modules/graphite/packaging/debian/10/rundeps with 100% similarity]
modules/graphite/.packaging/debian/9/rundeps [moved from modules/graphite/packaging/debian/9/rundeps with 100% similarity]
modules/graphite/.packaging/fedora/30/rundeps [moved from modules/graphite/packaging/fedora/30/rundeps with 100% similarity]
modules/graphite/.packaging/fedora/31/rundeps [moved from modules/graphite/packaging/fedora/31/rundeps with 100% similarity]
modules/graphite/.packaging/leap/15.2/NOTSUPPORTED [moved from modules/graphite/packaging/leap/15.2/NOTSUPPORTED with 100% similarity]
modules/graphite/.packaging/leap/15.2/pre-test.sh [moved from modules/graphite/packaging/leap/15.2/pre-test.sh with 100% similarity]
modules/graphite/.packaging/leap/15.2/rundeps [moved from modules/graphite/packaging/leap/15.2/rundeps with 100% similarity]
modules/graphite/.packaging/test.config [moved from modules/graphite/packaging/test.config with 100% similarity]
modules/graphite/.packaging/ubuntu/16.04/rundeps [moved from modules/graphite/packaging/ubuntu/16.04/rundeps with 100% similarity]
modules/graphite/.packaging/ubuntu/18.04/rundeps [moved from modules/graphite/packaging/ubuntu/18.04/rundeps with 100% similarity]
modules/hints/.packaging/test.config [moved from modules/hints/packaging/test.config with 100% similarity]
modules/http/.packaging/centos/7/rundeps [moved from modules/http/packaging/centos/7/rundeps with 100% similarity]
modules/http/.packaging/debian/10/rundeps [moved from modules/http/packaging/debian/10/rundeps with 100% similarity]
modules/http/.packaging/debian/9/rundeps [moved from modules/http/packaging/debian/9/rundeps with 100% similarity]
modules/http/.packaging/fedora/30/rundeps [moved from modules/http/packaging/fedora/30/rundeps with 100% similarity]
modules/http/.packaging/fedora/31/rundeps [moved from modules/http/packaging/fedora/31/rundeps with 100% similarity]
modules/http/.packaging/leap/15.2/NOTSUPPORTED [moved from modules/http/packaging/leap/15.2/NOTSUPPORTED with 100% similarity]
modules/http/.packaging/leap/15.2/pre-test.sh [moved from modules/http/packaging/leap/15.2/pre-test.sh with 100% similarity]
modules/http/.packaging/leap/15.2/rundeps [moved from modules/http/packaging/leap/15.2/rundeps with 100% similarity]
modules/http/.packaging/test.config [moved from modules/http/packaging/test.config with 100% similarity]
modules/http/.packaging/ubuntu/16.04/NOTSUPPORTED [moved from modules/http/packaging/ubuntu/16.04/NOTSUPPORTED with 100% similarity]
modules/http/.packaging/ubuntu/18.04/rundeps [moved from modules/http/packaging/ubuntu/18.04/rundeps with 100% similarity]
modules/nsid/.packaging/test.config [moved from modules/nsid/packaging/test.config with 100% similarity]
modules/policy/.packaging/test.config [moved from modules/policy/packaging/test.config with 100% similarity]
modules/predict/.packaging/test.config [moved from modules/predict/packaging/test.config with 100% similarity]
modules/prefill/.packaging/test.config [moved from modules/prefill/packaging/test.config with 100% similarity]
modules/priming/.packaging/test.config [moved from modules/priming/packaging/test.config with 100% similarity]
modules/rebinding/.packaging/test.config [moved from modules/rebinding/packaging/test.config with 100% similarity]
modules/refuse_nord/.packaging/test.config [moved from modules/refuse_nord/packaging/test.config with 100% similarity]
modules/renumber/.packaging/test.config [moved from modules/renumber/packaging/test.config with 100% similarity]
modules/serve_stale/.packaging/test.config [moved from modules/serve_stale/packaging/test.config with 100% similarity]
modules/stats/.packaging/test.config [moved from modules/stats/packaging/test.config with 100% similarity]
modules/ta_sentinel/.packaging/test.config [moved from modules/ta_sentinel/packaging/test.config with 100% similarity]
modules/ta_signal_query/.packaging/test.config [moved from modules/ta_signal_query/packaging/test.config with 100% similarity]
modules/ta_update/.packaging/test.config [moved from modules/ta_update/packaging/test.config with 100% similarity]
modules/view/.packaging/test.config [moved from modules/view/packaging/test.config with 100% similarity]
modules/watchdog/.packaging/test.config [moved from modules/watchdog/packaging/test.config with 100% similarity]
modules/workarounds/.packaging/test.config [moved from modules/workarounds/packaging/test.config with 100% similarity]
tests/packaging/README.rst
tests/packaging/test_packaging.py

similarity index 100%
rename from doc/packaging/test.sh
rename to doc/.packaging/test.sh
index 23f63f1410acf954d7e300188cfbe7524b16b5a0..5033b49a2ecc30f65c3a063ae82f0de47ff816d2 100644 (file)
@@ -3,7 +3,7 @@
 Packaging tests
 ===============
 
-Packaging tests used pytest, docker and each directory with subdirectory *packaging*
+Packaging tests used pytest, docker and each directory with subdirectory *.packaging*
 is called as *component*.
 
 Run tests for all components:
@@ -18,18 +18,18 @@ List all components:
 
   pytest tests/packaging --collect-only
 
-Run test for specific component (*doc/packaging*):
+Run test for specific component (*doc/.packaging*):
 
 .. code-block::
 
-  pytest -r fEsxX tests/packaging -k test_collect[debian_10-doc/packaging]
+  pytest -r fEsxX tests/packaging -k test_collect[debian_10-doc/.packaging]
 
 .. note::
 
        For debug add argument :code:`-s`.
 
-daemon/packaging component
---------------------------
+daemon/.packaging component
+---------------------------
 
 This is special component that is used by all others components.
 For each distribution and version are created two docker images with this component.
@@ -40,7 +40,7 @@ and *Run docker image* is tagged as :code:`kr-packaging-tests-<distro><version>-
 Others components
 -----------------
 
-All others components are based on *daemon/packaging* component (docker image).
+All others components are based on *daemon/.packaging* component (docker image).
 When component needs new building dependencies, new running dependencies
 or some scripts that change build or run phase (see `File structure of each component`_),
 new docker image is created.
index 834aa9b7c2c4b67ae5a13db91cdffdf14e545812..15be0bf23ae496e8d2d60c6bc669dec909d7f7a5 100644 (file)
@@ -11,8 +11,6 @@ from abc import ABC, abstractmethod
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
-EXCLUDED_TEST_DIRS = ['tests/unit/packaging', 'tests/packaging',
-                      'tests/integration/deckard/contrib/libfaketime/packaging']
 client = docker.from_env()
 
 
@@ -101,7 +99,7 @@ class DockerImages(ABC):
 
         dockerf.write('FROM {}\n'.format(from_image))
         dockerf.write('WORKDIR /root/kresd\n')
-        if self.module == 'daemon/packaging':
+        if self.module == 'daemon/.packaging':
             dockerf.write('COPY . /root/kresd\n')
         # when this file doesn't exists, tzdata needs user interaction
         dockerf.write('RUN if [ ! -f /etc/localtime ];' +
@@ -324,7 +322,7 @@ def list_dirs(path, exclude=None):
 
     for rootpath, dirs, _ in os.walk(path):
 
-        if (os.path.basename(rootpath) == 'packaging'):
+        if (os.path.basename(rootpath) == '.packaging'):
             fdir = os.path.relpath(rootpath, path)
             if exclude is not None:
                 if fdir not in exclude:
@@ -336,8 +334,8 @@ def list_dirs(path, exclude=None):
 
 
 def list_tests_dirs():
-    """return all 'packaging' directories without directories included in EXCLUDED_TEST_DIRS"""
-    return list_dirs(pytest.KR_ROOT_DIR, EXCLUDED_TEST_DIRS)
+    """return all 'packaging' directories"""
+    return list_dirs(pytest.KR_ROOT_DIR)
 
 
 def list_distro_vers(distro_root):
@@ -353,7 +351,7 @@ def list_distro_vers(distro_root):
 
 
 MODULES = list_tests_dirs()
-DISTROS = list_distro_vers(os.path.join(pytest.KR_ROOT_DIR, 'daemon/packaging'))
+DISTROS = list_distro_vers(os.path.join(pytest.KR_ROOT_DIR, 'daemon/.packaging'))
 DISTROS_NAMES = ['{0}_{1}'.format(distro['name'], distro['version']) for distro in DISTROS]
 
 
@@ -366,7 +364,7 @@ def buildenv(request, tmpdir_factory):
     if img is None:
         logger.warning('Unknown distro {}'.format(distro['name']))
     else:
-        img.module = 'daemon/packaging'
+        img.module = 'daemon/.packaging'
         tmpdir = tmpdir_factory.mktemp(distro['name']+distro['version'])
         img.build(tmpdir, tag=pytest.KR_PREFIX+distro['name']+distro['version']+'-build')
         img.build_run(tmpdir, img.build_id,
@@ -395,7 +393,7 @@ def test_collect(module, buildenv, tmp_path):
         pytest.skip('Unsupported linux distribution ({0} {1}:{2})'.format(buildenv.distro, buildenv.version, module))
 
     try:
-        if module == 'daemon/packaging':
+        if module == 'daemon/.packaging':
             # use main "run image" without changes
             logging.info('Use main "run image"')
             ch = ContainerHandler(buildenv.run_id)
@@ -409,14 +407,14 @@ def test_collect(module, buildenv, tmp_path):
                 buildmod.module = module
                 buildmod.build(tmp_path, from_image=buildenv.build_id,
                                tag=pytest.KR_PREFIX+buildmod.distro+buildmod.version+'-' +
-                               module+'-build')
+                               module.replace('/.packaging', '')+'-build')
 
             if buildmod is not None:
                 # new build image was made, create new module specific "run image"
                 logger.info('Create module specific "run image" from Dockerfile')
                 buildmod.build_run(tmp_path, buildmod.build_id,
                                    tag=pytest.KR_PREFIX+buildmod.distro+buildmod.version+'-' +
-                                   module+'-run', from_image=buildenv.run_id)
+                                   module.replace('/.packaging', '')+'-run', from_image=buildenv.run_id)
                 ch = ContainerHandler(buildmod.run_id)
                 ch.run()
             elif os.path.isfile(os.path.join(distro_dir, 'pre-run.sh')) \