From 15616cd6cfb7c4812b9f966248583cb2a2274ce2 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 7 Feb 2024 13:32:58 -0700 Subject: [PATCH 1/2] Fix paths for TPv2 in optional directory --- infrastructure/cdn-in-a-box/Makefile | 2 +- .../optional/docker-compose.traffic-portal-v2-test.yml | 2 +- .../optional/docker-compose.traffic-portal-v2.yml | 6 +++--- .../cdn-in-a-box/optional/traffic_portal_v2/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructure/cdn-in-a-box/Makefile b/infrastructure/cdn-in-a-box/Makefile index 7129d86c8f..c0f865f796 100644 --- a/infrastructure/cdn-in-a-box/Makefile +++ b/infrastructure/cdn-in-a-box/Makefile @@ -232,7 +232,7 @@ $(TP_DIST_RPM): $(TP_SOURCE) "$(PKG_COMMAND)" $(PKG_FLAGS) traffic_portal$(BUILD_SUFFIX) $(TP2_DIST_RPM): $(TP2_SOURCE) - "$(PKG_COMMAND)" $(PKG_FLAGS) traffic_portal_v2$(BUILD_SUFFIX) + "$(PKG_COMMAND)" -o $(PKG_FLAGS) traffic_portal_v2$(BUILD_SUFFIX) $(TR_DIST_RPM) $(TOMCAT_DIST_RPM): $(TR_SOURCE) "$(PKG_COMMAND)" $(PKG_FLAGS) traffic_router$(BUILD_SUFFIX) 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 bfef10f0cb..c72bbf76b9 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 @@ -27,7 +27,7 @@ services: BASE_IMAGE: ${BASE_IMAGE:-rockylinux} RHEL_VERSION: ${RHEL_VERSION:-8} env_file: - - ../variables.env + - variables.env environment: SKIP_DIG_IP: 'true' hostname: tpv2-e2e 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 b14a2768fa..e9a642ec1f 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 @@ -22,17 +22,17 @@ services: trafficportalv2: build: context: . - dockerfile: traffic_portal_v2/Dockerfile + dockerfile: optional/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 + TRAFFIC_PORTAL_RPM: optional/traffic_portal_v2/traffic_portal_v2.rpm depends_on: - enroller domainname: infra.ciab.test env_file: - - ../variables.env + - variables.env hostname: trafficportalv2 image: trafficportalv2 volumes: diff --git a/infrastructure/cdn-in-a-box/optional/traffic_portal_v2/Dockerfile b/infrastructure/cdn-in-a-box/optional/traffic_portal_v2/Dockerfile index 7c366c6948..2b0625f1c3 100644 --- a/infrastructure/cdn-in-a-box/optional/traffic_portal_v2/Dockerfile +++ b/infrastructure/cdn-in-a-box/optional/traffic_portal_v2/Dockerfile @@ -34,7 +34,7 @@ RUN set -o pipefail && \ curl -sLf https://rpm.nodesource.com/setup_18.x | bash # Override TRAFFIC_PORTAL_RPM arg to use a different one using --build-arg TRAFFIC_PORTAL_RPM=... Can be local file or http://... -ARG TRAFFIC_PORTAL_RPM=traffic_portal_v2/traffic_portal_v2.rpm +ARG TRAFFIC_PORTAL_RPM=optional/traffic_portal_v2/traffic_portal_v2.rpm ARG TO_HOST=$TO_HOST @@ -57,7 +57,7 @@ RUN rpm -Uvh /$(basename $TRAFFIC_PORTAL_RPM) && \ rm /$(basename $TRAFFIC_PORTAL_RPM) ADD enroller/server_template.json \ - traffic_portal_v2/run.sh \ + optional/traffic_portal_v2/run.sh \ traffic_ops/to-access.sh / COPY dns/set-dns.sh \ From 5d783d472deeecbbec5f7ef3caae33c44ae9da8a Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 7 Feb 2024 14:04:20 -0700 Subject: [PATCH 2/2] Prefix TPv2 RPM path with "optional/" in makefile --- infrastructure/cdn-in-a-box/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/cdn-in-a-box/Makefile b/infrastructure/cdn-in-a-box/Makefile index c0f865f796..dad40ab16d 100644 --- a/infrastructure/cdn-in-a-box/Makefile +++ b/infrastructure/cdn-in-a-box/Makefile @@ -86,7 +86,7 @@ ATS_RPM := cache/trafficserver.rpm TM_RPM := traffic_monitor/traffic_monitor.rpm TO_RPM := traffic_ops/traffic_ops.rpm TP_RPM := traffic_portal/traffic_portal.rpm -TP2_RPM := traffic_portal_v2/traffic_portal_v2.rpm +TP2_RPM := optional/traffic_portal_v2/traffic_portal_v2.rpm TR_RPM := traffic_router/traffic_router.rpm TOMCAT_RPM := traffic_router/tomcat.rpm TS_RPM := traffic_stats/traffic_stats.rpm