From 4c2b42f141e1501222a284f964eb4303cc4f03aa Mon Sep 17 00:00:00 2001
From: Brinda Santh <bs2796@att.com>
Date: Thu, 3 Oct 2019 20:02:29 -0400
Subject: Add bi-directional python executor tests

Issue-ID: CCSDK-1747
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I2e2b974d35d6878418eafe8ece9fcb1d69622a61
---
 ms/py-executor/docker/Dockerfile       | 4 ++--
 ms/py-executor/docker/distribution.xml | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'ms/py-executor/docker')

diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile
index 112180581..b49daf68f 100644
--- a/ms/py-executor/docker/Dockerfile
+++ b/ms/py-executor/docker/Dockerfile
@@ -11,8 +11,8 @@ RUN tar -xzf /source.tar.gz -C /tmp \
  && rm -rf /source.tar.gz \
  && rm -rf /tmp/@project.build.finalName@
 
-RUN pip install --no-cache-dir -r /opt/app/onap/requirements.txt
+RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements.txt
 
 VOLUME /opt/app/onap/blueprints/deploy/
 
-ENTRYPOINT /opt/app/onap/start.sh
\ No newline at end of file
+ENTRYPOINT /opt/app/onap/python/start.sh
\ No newline at end of file
diff --git a/ms/py-executor/docker/distribution.xml b/ms/py-executor/docker/distribution.xml
index 8bd06c88f..6235a7b8a 100755
--- a/ms/py-executor/docker/distribution.xml
+++ b/ms/py-executor/docker/distribution.xml
@@ -34,20 +34,22 @@
         </fileSet>
         <fileSet>
             <directory>${project.basedir}</directory>
-            <outputDirectory>opt/app/onap</outputDirectory>
+            <outputDirectory>opt/app/onap/python</outputDirectory>
             <includes>
                 <include>requirements.txt</include>
                 <include>configuration.ini</include>
             </includes>
             <useDefaultExcludes>true</useDefaultExcludes>
+            <fileMode>0666</fileMode>
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/docker</directory>
-            <outputDirectory>opt/app/onap</outputDirectory>
+            <outputDirectory>opt/app/onap/python</outputDirectory>
             <includes>
                 <include>*.sh</include>
             </includes>
             <useDefaultExcludes>true</useDefaultExcludes>
+            <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file
-- 
cgit 1.2.3-korg