Update dependencies (release task)

- Changed HTTP Client version to 4.5.13
- Use system Docker-Compose instead of downloading it
- Removed ALL Docker Compose File versions

Issue-ID: CPS-1106
Change-Id: I0734099caad79acd52aecdb2faf98cceb0943224
Signed-off-by: JosephKeenan <joseph.keenan@est.tech>
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>

diff --git a/csit/plans/dmi/pnfsim/docker-compose.yml b/csit/plans/dmi/pnfsim/docker-compose.yml
index de9b271..f39b862 100644 (file)
--- a/csit/plans/dmi/pnfsim/docker-compose.yml
+++ b/csit/plans/dmi/pnfsim/docker-compose.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-version: '3'
-
 services:
   netconf-pnp-simulator:
     image: nexus3.onap.org:10001/onap/integration/simulators/netconf-pnp-simulator:2.8.6

diff --git a/csit/plans/dmi/sdnc/docker-compose.yml b/csit/plans/dmi/sdnc/docker-compose.yml
index c604b7c..ab140e9 100644 (file)
--- a/csit/plans/dmi/sdnc/docker-compose.yml
+++ b/csit/plans/dmi/sdnc/docker-compose.yml
@@ -14,8 +14,6 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-version: '3'
-
 services:
   mariadb:
     image: mariadb:10.5
@@ -70,4 +68,4 @@ services:
       driver: "json-file"
       options:
         max-size: "30m"
-        max-file: "5"
\ No newline at end of file
+        max-file: "5"

diff --git a/csit/plans/dmi/setup.sh b/csit/plans/dmi/setup.sh
index 9a6d27b..03d79c2 100755 (executable)
--- a/csit/plans/dmi/setup.sh
+++ b/csit/plans/dmi/setup.sh
@@ -55,12 +55,11 @@ mkdir -p $WORKSPACE/archives/ncmp-dmi-plugin
 cp $WORKSPACE/../docker-compose/*.yml $WORKSPACE/archives/ncmp-dmi-plugin
 cd $WORKSPACE/archives/ncmp-dmi-plugin
 
-# download docker-compose of a required version (1.25.0 supports configuration of version 3.7)
-curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose
-chmod +x docker-compose
+# Check Docker Compose version on system
+docker-compose version
 
 # start CPS and PostgreSQL containers with docker compose
-./docker-compose up -d
+docker-compose up -d
 
 ####################### setup cps-ncmp ############################
 
@@ -70,10 +69,7 @@ mkdir -p $WORKSPACE/archives/dc-cps-ncmp
 cat $WORKSPACE/archives/cps/docker-compose/docker-compose.yml
 cp $WORKSPACE/archives/cps/docker-compose/*.yml $WORKSPACE/archives/dc-cps-ncmp
 cd $WORKSPACE/archives/dc-cps-ncmp
-# copy docker-compose (downloaded already for cps)
-cp $WORKSPACE/archives/ncmp-dmi-plugin/docker-compose .
-chmod +x docker-compose
-./docker-compose up -d
+docker-compose up -d
 
 ###################### setup sdnc #######################################
 source $WORKSPACE/plans/dmi/sdnc/sdnc_setup.sh
@@ -138,4 +134,4 @@ check_health $DMI_HOST:$DMI_MANAGEMENT_PORT 'dmi-plugin'
 
 ###################### ROBOT Configurations ##########################
 # Pass variables required for Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_MANAGEMENT_PORT:$DMI_MANAGEMENT_PORT -v CPS_CORE_MANAGEMENT_PORT:$CPS_CORE_MANAGEMENT_PORT -v SDNC_HOST:$SDNC_HOST -v SDNC_PORT:$SDNC_PORT -v DATADIR:$WORKSPACE/data --exitonfailure"
\ No newline at end of file
+ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_MANAGEMENT_PORT:$DMI_MANAGEMENT_PORT -v CPS_CORE_MANAGEMENT_PORT:$CPS_CORE_MANAGEMENT_PORT -v SDNC_HOST:$SDNC_HOST -v SDNC_PORT:$SDNC_PORT -v DATADIR:$WORKSPACE/data --exitonfailure"

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 506b9d7..5fb0bc1 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -17,8 +17,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-version: "3.7"
-
 services:
   ncmp-dmi-plugin:
     container_name: ncmp-dmi-plugin

diff --git a/pom.xml b/pom.xml
index c5bd106..c935f63 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <jacoco.minimum.coverage>0.98</jacoco.minimum.coverage>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <httpclient.version>4.4.1</httpclient.version>
+        <httpclient.version>4.5.13</httpclient.version>
     </properties>
     <dependencyManagement>
         <dependencies>