From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Thu, 23 Jun 2022 10:48:09 +0000 (+0100)
Subject: Duplicate volume mount for drools-apps in CSIT
X-Git-Tag: 2.5.0~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F129669%2F3;p=policy%2Fdocker.git

Duplicate volume mount for drools-apps in CSIT

drools-apps docker container copies feature-lifecycle.properties from
/tmp/policy-install/config to /opt/app/policy/config
Because docker-compose mounts this file twice, it causes OpenSuse
image to abort with error 'cp: X and Y are the same file'

Issue-ID: POLICY-4231
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I91a3b1d3d2b8ed1075fd3392aae9988475f92bf7
---

diff --git a/csit/compose-grafana.yml b/csit/compose-grafana.yml
index 1f8b4095..fad1bdfb 100644
--- a/csit/compose-grafana.yml
+++ b/csit/compose-grafana.yml
@@ -165,7 +165,6 @@ services:
        - 9696
       volumes:
        - ./config/drools-apps/custom:/tmp/policy-install/config:ro
-       - ./config/drools-apps/custom/feature-lifecycle.properties:/opt/app/policy/features/lifecycle/config/feature-lifecycle.properties:ro
        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
       env_file:
         - config/drools-apps/env/base.conf
diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml
index 2cc9e45b..d0edf0ca 100644
--- a/csit/docker-compose-all.yml
+++ b/csit/docker-compose-all.yml
@@ -174,7 +174,6 @@ services:
        - 9696
       volumes:
        - ./config/drools-apps/custom:/tmp/policy-install/config:ro
-       - ./config/drools-apps/custom/feature-lifecycle.properties:/opt/app/policy/features/lifecycle/config/feature-lifecycle.properties:ro
        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
       env_file:
         - config/drools-apps/env/base.conf
diff --git a/csit/docker-compose-gui-smoke.yml b/csit/docker-compose-gui-smoke.yml
index 3951cb2f..fea29e3d 100644
--- a/csit/docker-compose-gui-smoke.yml
+++ b/csit/docker-compose-gui-smoke.yml
@@ -172,7 +172,6 @@ services:
        - 9696
       volumes:
        - ./config/drools-apps/custom:/tmp/policy-install/config:ro
-       - ./config/feature-lifecycle.properties:/opt/app/policy/features/lifecycle/config/feature-lifecycle.properties:ro
        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
       env_file:
         - ./config/drools-apps/env/base.conf