commit 181e6c525c5e05bbb3e580fd0793b8332200659d
author rameshiyer27 <ramesh.murugan.iyer@est.tech> Thu Mar 30 10:50:18 2023 +0100
committer rameshiyer27 <ramesh.murugan.iyer@est.tech> Thu Mar 30 14:23:07 2023 +0100
tree c4f4f35f6ef3f92a96012abfed161a1e76463000
parent 9acad08dfcc1e91b1640f550140e8fa625034ef2

Disable K8s CSIT temporarily to fix timeout issue in Jenkins

The pods take longer time than usual in Jenkins vm which prevents robot
test cases getting executed. This will be fixed in the upcoming patch.
Fixing supporting docker images to be pulled from nexus

Issue-ID: POLICY-4541
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Change-Id: If01b98bee51e36cb6104fa6eff006ad8194dc1b2

compose/docker-compose.gui.yml

diff --git a/compose/docker-compose.gui.yml b/compose/docker-compose.gui.yml
index 3d711af..5a563ae 100644
--- a/compose/docker-compose.gui.yml
+++ b/compose/docker-compose.gui.yml
@@ -36,7 +36,7 @@
      working_dir: /opt/app/policy/gui/bin
      command: ./policy-gui.sh
    policy-clamp-backend:
-     image: ${CONTAINER_LOCATION}onap/policy-clamp-backend:${POLICY_CLAMP_VERSION}
+     image: ${CONTAINER_LOCATION}onap/policy-clamp-backend:latest
      container_name: policy-clamp-backend
      depends_on:
       - policy-clamp-runtime-acm

compose/docker-compose.yml

diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index dee7663..e26a0be 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -343,7 +343,7 @@
         'message-router', '3904'
         ]
    prometheus:
-      image: prom/prometheus:v2.32.1
+      image: ${CONTAINER_LOCATION}prom/prometheus:latest
       container_name: prometheus
       hostname: prometheus
       ports:
@@ -351,7 +351,7 @@
       volumes:
        - ./metrics/prometheus.yml:/etc/prometheus/prometheus.yml
    grafana:
-      image: grafana/grafana-oss:8.3.4
+      image: ${CONTAINER_LOCATION}grafana/grafana:latest
       container_name: grafana
       depends_on:
        - prometheus
@@ -362,19 +362,3 @@
        - ./metrics/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
        - ./metrics/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
        - ./metrics/dashboards:/var/lib/grafana/dashboards
-   node-exporter:
-      image: prom/node-exporter:latest
-      container_name: node-exporter
-      restart: unless-stopped
-      volumes:
-         - /proc:/host/proc:ro
-         - /sys:/host/sys:ro
-         - /:/rootfs:ro
-      command:
-         - '--path.procfs=/host/proc'
-         - '--path.rootfs=/rootfs'
-         - '--path.sysfs=/host/sys'
-         - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
-      expose:
-         - 9100
-