commit 70dd306f0c979db5d780fe25a02455001aabfbaf
author Dennis Dmitriev <ddmitriev@mirantis.com> Wed Jan 24 20:45:49 2018 +0200
committer Dennis Dmitriev <ddmitriev@mirantis.com> Wed Jan 24 20:46:21 2018 +0200
tree 1380383cbcdf039b276fcb91bd5b91a21ae47e6b
parent f00a38468f00db60a9d7078a63c4aa1ccf7de283

Fix copying the model into /srv/salt/reclass

Change-Id: I9bdd460b78b27fc1b6dd52b53b27e5015ce70ae6

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 5b5dd50..2bb0959 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -126,8 +126,7 @@
 
     # In the day01 image, /srv/salt/reclass directory is already exists, so clone the model into the reclass.tmp directory
     export GIT_SSL_NO_VERIFY=true; git clone -b {{ SALT_MODELS_BRANCH }} {{ SALT_MODELS_REPOSITORY }} /srv/salt/reclass.tmp;
-    cp -r /srv/salt/reclass.tmp/* /srv/salt/reclass/
-    cp -r /srv/salt/reclass.tmp/.git /srv/salt/reclass/
+    rsync -a /srv/salt/reclass.tmp/ /srv/salt/reclass;
 
     pushd /srv/salt/reclass;
     git config submodule."classes/system".url "{{ SALT_MODELS_SYSTEM_REPOSITORY }}";