[trafficcontrol] branch master updated: Fixed some issues with building CIAB

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new e6d8bdd  Fixed some issues with building CIAB
e6d8bdd is described below

commit e6d8bdd5897dc18b69017fd70b7988594952d74e
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Wed Oct 24 21:54:12 2018 -0600

    Fixed some issues with building CIAB
    
    Makefile was unable to operate with '-j' because nothing was creating a Tomcat RPM, and would fail on systems that had an 'rpm' binary but weren't 'el7'. Both fixed.
    Also, the cache Docker build was broken because a new Trafficserver RPM replaced the old 7.1.4, but had a different name. Fixed.
---
 infrastructure/cdn-in-a-box/Makefile         | 11 ++---------
 infrastructure/cdn-in-a-box/cache/Dockerfile |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/Makefile b/infrastructure/cdn-in-a-box/Makefile
index 324c0f5..37f8526 100644
--- a/infrastructure/cdn-in-a-box/Makefile
+++ b/infrastructure/cdn-in-a-box/Makefile
@@ -34,14 +34,7 @@ TC_VERSION := $(shell cat "../../VERSION")
 TOMCAT_VERSION := $(shell grep 'export TOMCAT_VERSION=' ../../traffic_router/build/build_rpm.sh  | cut -d '=' -f 2)
 TOMCAT_RELEASE := $(shell grep 'export TOMCAT_RELEASE=' ../../traffic_router/build/build_rpm.sh  | cut -d '=' -f 2)
 
-RHEL_VERSION :=el7
-ifeq ($(shell uname -s),Linux)
-ifeq ($(shell which rpm 2>/dev/null),)
-$(info Couldn't find 'rpm' binary, building for RHEL version $(RHEL_VERSION))
-else
-RHEL_VERSION :=el$(shell rpm -q --qf "%{VERSION}" $(shell rpm -q --whatprovides redhat-release))
-endif
-endif
+RHEL_VERSION := el7
 
 SPECIAL_SAUCE := $(TC_VERSION)-$(BUILD_NUMBER).$(RHEL_VERSION).x86_64.rpm
 SPECIAL_SEASONING := $(TOMCAT_VERSION).$(TOMCAT_RELEASE)-$(BUILD_NUMBER).$(RHEL_VERSION).x86_64.rpm
@@ -85,7 +78,7 @@ traffic_router/tomcat.rpm: ../../dist/tomcat-$(SPECIAL_SEASONING)
 ../../dist/traffic_portal-$(SPECIAL_SAUCE): $(TP_SOURCE)
 	sudo ../../pkg -v traffic_portal_build
 
-../../dist/traffic_router-$(SPECIAL_SAUCE): $(TR_SOURCE)
+../../dist/traffic_router-$(SPECIAL_SAUCE) ../../dist/tomcat-$(SPECIAL_SEASONING): $(TR_SOURCE)
 	sudo ../../pkg -v traffic_router_build
 
 clean:
diff --git a/infrastructure/cdn-in-a-box/cache/Dockerfile b/infrastructure/cdn-in-a-box/cache/Dockerfile
index 5258b05..01ae708 100644
--- a/infrastructure/cdn-in-a-box/cache/Dockerfile
+++ b/infrastructure/cdn-in-a-box/cache/Dockerfile
@@ -25,8 +25,8 @@ FROM centos:7
 
 EXPOSE 80
 
-ADD https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-7.1.4-1.el7.x86_64.rpm /trafficserver.rpm
-ADD https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-devel-7.1.4-1.el7.x86_64.rpm /trafficserver-devel.rpm
+ADD https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-7.1.4-2.el7.x86_64.rpm /trafficserver.rpm
+ADD https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-devel-7.1.4-2.el7.x86_64.rpm /trafficserver-devel.rpm
 
 RUN yum install -y kyotocabinet-libs epel-release initscripts iproute net-tools nmap-ncat gettext autoconf automake libtool gcc-c++ cronie glibc-devel openssl-devel
 RUN yum install -y /trafficserver.rpm /trafficserver-devel.rpm jq python34-psutil python34-typing python34-setuptools python34-pip && yum clean all