[trafficcontrol] branch master updated: Update trafficserver.spec (#7026)

[zr...@apache.org]

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

zrhoffman 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 e696a13b5a Update trafficserver.spec (#7026)
e696a13b5a is described below

commit e696a13b5a58756899b9a67893d7a251616589ef
Author: Evan Zelkowitz <ev...@gmail.com>
AuthorDate: Fri Aug 26 16:01:18 2022 -0600

    Update trafficserver.spec (#7026)
    
    * Update trafficserver.spec
    
    change ip_allow.config to yaml, ssl_server_name to sni.yaml
    
    * Add strategies.yaml to spec file list
    
    * Change all of these files to be 'missingok', which Im hoping will allow rpmbuild to skip them if they dont exist but include them if they do
    
    * Changing to set ATS_MAJOR_VERSION and pass into the rpmbuild for an %if test
---
 cache-config/testing/docker/trafficserver/run.sh             |  7 ++++---
 cache-config/testing/docker/trafficserver/trafficserver.spec | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cache-config/testing/docker/trafficserver/run.sh b/cache-config/testing/docker/trafficserver/run.sh
index 18e6eec68b..7a6bbd59ef 100755
--- a/cache-config/testing/docker/trafficserver/run.sh
+++ b/cache-config/testing/docker/trafficserver/run.sh
@@ -25,10 +25,11 @@ function die() {
 OS_VERSION="${OS_VERSION}"
 OS_DISTRO=${OS_DISTRO}
 ATS_VERSION="${ATS_VERSION}"
-
+ATS_MAJOR_VERSION=${ATS_VERSION::1}
 echo "OS_DISTRO:${OS_DISTRO}"
 echo "OS_VERSION:${OS_VERSION}"
 echo "ATS_VERSION:${ATS_VERSION}"
+echo "ATS_MAJOR_VERSION:${ATS_MAJOR_VERSION}"
 
 mkdir -p /opt/build
 cd /opt/build
@@ -115,9 +116,9 @@ rm -f /root/rpmbuild/RPMS/x86_64/trafficserver-*.rpm
 cd trafficserver
 
 if [[ ${RUN_ATS_UNIT_TESTS} == true ]]; then
-  rpmbuild -bb ${rpmbuild_openssl} /trafficserver.spec --define 'run_unit_tests 1' || die "Failed to build the ATS RPM."
+  rpmbuild --define "ats_version $ATS_MAJOR_VERSION" -bb ${rpmbuild_openssl} /trafficserver.spec --define 'run_unit_tests 1' || die "Failed to build the ATS RPM."
 else
-  rpmbuild -bb ${rpmbuild_openssl} /trafficserver.spec || die "Failed to build the ATS RPM."
+  rpmbuild --define "ats_version $ATS_MAJOR_VERSION" -bb ${rpmbuild_openssl} /trafficserver.spec || die "Failed to build the ATS RPM."
 fi
 
 echo "Build completed"
diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec
index bdaa59bcf5..35ad16e5ca 100644
--- a/cache-config/testing/docker/trafficserver/trafficserver.spec
+++ b/cache-config/testing/docker/trafficserver/trafficserver.spec
@@ -143,7 +143,6 @@ fi
 /opt/trafficserver/etc/trafficserver/trafficserver-release
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/cache.config
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/hosting.config
-%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.config
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/logging.yaml
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/parent.config
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/plugin.config
@@ -152,9 +151,16 @@ fi
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/socks.config
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/splitdns.config
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_multicert.config
-%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_server_name.yaml
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/storage.config
 %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/volume.config
+%if %{ats_version} >= 9
+%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/strategies.yaml
+%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.yaml
+%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/sni.yaml
+%else
+%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_server_name.yaml
+%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.config
+%endif
 
 %changelog
 * Wed Mar 10 2021 Jonathan Gray <jhg03a(at)apache.org>