From 72ae5def09cd6acdef2f4aaea375a12f0a01c27f Mon Sep 17 00:00:00 2001
From: Zach Hoffman <zrhoffman@apache.org>
Date: Wed, 7 Feb 2024 09:04:06 -0700
Subject: [PATCH] Rearrange TPv2 docker-compose files

---
 .../docker-compose.traffic-portal-v2-test.yml | 20 +++++++--------
 ...compose.traffic-portal-v2.expose-ports.yml | 25 +++----------------
 .../docker-compose.traffic-portal-v2.yml      | 25 +++++++++++++++++--
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
index b65e571150..bfef10f0cb 100644
--- a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
+++ b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
@@ -18,25 +18,23 @@
 version: '3.8'
 
 services:
-
-  trafficportalv2:
+  tpv2-e2e-test:
     build:
-      context: .
-      dockerfile: traffic_portal_v2/Dockerfile
+      context: ../../..
+      dockerfile: infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
       args:
         # Change BASE_IMAGE to centos when RHEL_VERSION=7
         BASE_IMAGE: ${BASE_IMAGE:-rockylinux}
         RHEL_VERSION: ${RHEL_VERSION:-8}
-        TRAFFIC_PORTAL_RPM: traffic_portal_v2/traffic_portal_v2.rpm
-    depends_on:
-      - enroller
-    domainname: infra.ciab.test
     env_file:
-      - variables.env
-    hostname: trafficportalv2
-    image: trafficportalv2
+      - ../variables.env
+    environment:
+      SKIP_DIG_IP: 'true'
+    hostname: tpv2-e2e
+    domainname: infra.ciab.test
     volumes:
       - shared:/shared
+      - ../../../junit:/junit
 
 volumes:
   shared:
diff --git a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.expose-ports.yml b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.expose-ports.yml
index c72bbf76b9..581d5b2730 100644
--- a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.expose-ports.yml
+++ b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.expose-ports.yml
@@ -18,25 +18,6 @@
 version: '3.8'
 
 services:
-  tpv2-e2e-test:
-    build:
-      context: ../../..
-      dockerfile: infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
-      args:
-        # Change BASE_IMAGE to centos when RHEL_VERSION=7
-        BASE_IMAGE: ${BASE_IMAGE:-rockylinux}
-        RHEL_VERSION: ${RHEL_VERSION:-8}
-    env_file:
-      - variables.env
-    environment:
-      SKIP_DIG_IP: 'true'
-    hostname: tpv2-e2e
-    domainname: infra.ciab.test
-    volumes:
-      - shared:/shared
-      - ../../../junit:/junit
-
-volumes:
-  shared:
-    external: false
-  junit:
+  trafficportalv2:
+    ports:
+      - "8443:443"
diff --git a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.yml b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.yml
index 581d5b2730..b14a2768fa 100644
--- a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.yml
+++ b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2.yml
@@ -18,6 +18,27 @@
 version: '3.8'
 
 services:
+
   trafficportalv2:
-    ports:
-      - "8443:443"
+    build:
+      context: .
+      dockerfile: traffic_portal_v2/Dockerfile
+      args:
+        # Change BASE_IMAGE to centos when RHEL_VERSION=7
+        BASE_IMAGE: ${BASE_IMAGE:-rockylinux}
+        RHEL_VERSION: ${RHEL_VERSION:-8}
+        TRAFFIC_PORTAL_RPM: traffic_portal_v2/traffic_portal_v2.rpm
+    depends_on:
+      - enroller
+    domainname: infra.ciab.test
+    env_file:
+      - ../variables.env
+    hostname: trafficportalv2
+    image: trafficportalv2
+    volumes:
+      - shared:/shared
+
+volumes:
+  shared:
+    external: false
+  junit: