fix test configurations with galaxy naming, kitchen copy role

juju4 · Jan 4, 2017 · 1015ff1 · 1015ff1
1 parent 59a883a
commit 1015ff1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/get-dependencies.sh b/get-dependencies.sh
@@ -14,6 +14,10 @@ fi
 [ ! -d $rolesdir/geerlingguy.apache ] && git clone https://github.com/geerlingguy/ansible-role-apache.git $rolesdir/geerlingguy.apache
 #[ ! -d $rolesdir/geerlingguy.mysql ] && git clone https://github.com/geerlingguy/ansible-role-mysql.git $rolesdir/geerlingguy.mysql
 #[ ! -d $rolesdir/w3af ] && git clone https://github.com/juju4/ansible-w3af $rolesdir/w3af
-## galaxy naming
-[ ! -e $rolesdir/juju4.MISP ] && ln -s ansible-MISP $rolesdir/juju4.MISP
+## galaxy naming: kitchen fails to transfer symlink folder
+#[ ! -e $rolesdir/juju4.MISP ] && ln -s ansible-MISP $rolesdir/juju4.MISP
+[ ! -e $rolesdir/juju4.MISP ] && cp -R $rolesdir/ansible-MISP $rolesdir/juju4.MISP
+
+## don't stop build on this script return code
+true
 
diff --git a/test/integration/nginx/default.yml b/test/integration/nginx/default.yml
@@ -13,5 +13,5 @@
         - { u: dupond@admin.test, p: dupond_passphrase. }
   roles:
 #    - geerlingguy.nginx
-    - MISP
+    - juju4.MISP