From 73c1d66677f08de35454e60463abb4cb9f1ac7de Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 3 Oct 2019 10:26:23 -0700 Subject: [PATCH] Rename cgcs_overlay to mock_overlay This helps to debrand (remove cgcs) from the tools area Story: 2006387 Task: 36208 Change-Id: I357837a710207f8cec6409d1de99f443f8c50c84 Signed-off-by: Saul Wold --- Dockerfile | 4 ++-- toCOPY/{cgcs_overlay => mock_overlay}/Makefile | 0 toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/Makefile | 0 toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/README | 0 .../mount_wrappers/mock_cache_umount.c | 0 .../mount_wrappers/mock_cache_umount.sh | 0 .../mount_wrappers/mock_cache_unlock.c | 0 .../mount_wrappers/mock_cache_unlock.sh | 0 .../mount_wrappers/mock_tmpfs_mount.c | 0 .../mount_wrappers/mock_tmpfs_mount.sh | 0 .../mount_wrappers/mock_tmpfs_umount.c | 0 .../mount_wrappers/mock_tmpfs_umount.sh | 0 .../mount_wrappers/overlay_mount.c | 0 .../mount_wrappers/overlay_mount.sh | 0 .../mount_wrappers/overlay_umount.c | 0 .../mount_wrappers/overlay_umount.sh | 0 tox.ini | 2 +- 17 files changed, 3 insertions(+), 3 deletions(-) rename toCOPY/{cgcs_overlay => mock_overlay}/Makefile (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/Makefile (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/README (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_cache_umount.c (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_cache_umount.sh (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_cache_unlock.c (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_cache_unlock.sh (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_tmpfs_mount.c (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_tmpfs_mount.sh (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_tmpfs_umount.c (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/mock_tmpfs_umount.sh (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/overlay_mount.c (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/overlay_mount.sh (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/overlay_umount.c (100%) rename toCOPY/{cgcs_overlay => mock_overlay}/mount_wrappers/overlay_umount.sh (100%) diff --git a/Dockerfile b/Dockerfile index 26225f921..7ab41938c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -147,8 +147,8 @@ RUN useradd -s /sbin/nologin -u 9001 -g 9001 mockbuild && \ # Inherited tools for mock stuff # we at least need the mock_cache_unlock tool # they install into /usr/bin -COPY toCOPY/cgcs_overlay /opt/cgcs_overlay -RUN cd /opt/cgcs_overlay && \ +COPY toCOPY/mock_overlay /opt/mock_overlay +RUN cd /opt/mock_overlay && \ make && \ make install diff --git a/toCOPY/cgcs_overlay/Makefile b/toCOPY/mock_overlay/Makefile similarity index 100% rename from toCOPY/cgcs_overlay/Makefile rename to toCOPY/mock_overlay/Makefile diff --git a/toCOPY/cgcs_overlay/mount_wrappers/Makefile b/toCOPY/mock_overlay/mount_wrappers/Makefile similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/Makefile rename to toCOPY/mock_overlay/mount_wrappers/Makefile diff --git a/toCOPY/cgcs_overlay/mount_wrappers/README b/toCOPY/mock_overlay/mount_wrappers/README similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/README rename to toCOPY/mock_overlay/mount_wrappers/README diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.c b/toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.c similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.c rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.c diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.sh b/toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.sh similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.sh rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.sh diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.c b/toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.c similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.c rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.c diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.sh b/toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.sh similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.sh rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.sh diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.c b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.c similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.c rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.c diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.sh b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.sh similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.sh rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.sh diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.c b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.c similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.c rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.c diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.sh b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.sh similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.sh rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.sh diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.c b/toCOPY/mock_overlay/mount_wrappers/overlay_mount.c similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.c rename to toCOPY/mock_overlay/mount_wrappers/overlay_mount.c diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.sh b/toCOPY/mock_overlay/mount_wrappers/overlay_mount.sh similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.sh rename to toCOPY/mock_overlay/mount_wrappers/overlay_mount.sh diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.c b/toCOPY/mock_overlay/mount_wrappers/overlay_umount.c similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.c rename to toCOPY/mock_overlay/mount_wrappers/overlay_umount.c diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.sh b/toCOPY/mock_overlay/mount_wrappers/overlay_umount.sh similarity index 100% rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.sh rename to toCOPY/mock_overlay/mount_wrappers/overlay_umount.sh diff --git a/tox.ini b/tox.ini index ada40858a..1ef026fdb 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = -print0 | xargs -0 yamllint" bash -c "find {toxinidir} \ -not \( -type d -name .?\* -prune \) \ - -not \( -type d -path {toxinidir}/toCOPY/cgcs_overlay -prune \) \ + -not \( -type d -path {toxinidir}/toCOPY/mock_overlay -prune \) \ -type f \ -not -name \*~ \ -not -name \*.md \