fix ciab-build (#125)

* fix ciab-build * fix yumserver Dockerfile * Update Go version to 1.22.5 (apache#8034) * Update Go version to 1.22.5 * Update some images to Rocky Linux 8 --------- Co-authored-by: asf-ci-trafficcontrol <[email protected]> Co-authored-by: Zach Hoffman <[email protected]> --------- Co-authored-by: asf-ci-trafficcontrol <[email protected]> Co-authored-by: Zach Hoffman <[email protected]>
zrhoffman · Jul 22, 2024 · 123445f · 123445f
1 parent fa8472f
commit 123445f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/cache-config/testing/docker/trafficserver/Dockerfile b/cache-config/testing/docker/trafficserver/Dockerfile
@@ -116,6 +116,7 @@ COPY cache-config/testing/docker/trafficserver/traffic_server_jemalloc \
      cache-config/testing/docker/trafficserver/cjose.pic.patch  \
      cache-config/testing/docker/trafficserver/jansson.pic.patch \
      cache-config/testing/docker/trafficserver/run.sh \ 
-    / 
+     cache-config/testing/docker/trafficserver/trafficserver.env \
+    /
 
 CMD /run.sh
diff --git a/cache-config/testing/docker/trafficserver/run.sh b/cache-config/testing/docker/trafficserver/run.sh
@@ -93,6 +93,7 @@ cd /root/rpmbuild/SOURCES
 # clone the trafficserver repo
 git clone https://github.com/apache/trafficserver.git --branch $ATS_VERSION || die "Failed to fetch the ATS Source"
 cp /traffic_server_jemalloc .
+cp /trafficserver.env .
 
 # patch in the astats plugin
 (cp -fa /astats_over_http /root/rpmbuild/SOURCES/trafficserver/plugins/astats_over_http

diff --git a/cache-config/testing/docker/trafficserver/trafficserver.env b/cache-config/testing/docker/trafficserver/trafficserver.env
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+STDOUTLOG=/var/log/trafficserver/traffic.out
+STDERRLOG=/var/log/trafficserver/traffic.out
diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec
@@ -53,6 +53,7 @@ Apache Traffic Server with Apache Traffic Control modifications and environment
 %setup -c -T
 cp -far %{src}/. .
 cp -fa %{src}/../traffic_server_jemalloc ..
+cp -fa %{src}/../trafficserver.env ..
 autoreconf -vfi
 
 %build
@@ -81,8 +82,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/etc/trafficserver/snapshots
 mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp rc/trafficserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/
 cp ../traffic_server_jemalloc $RPM_BUILD_ROOT/opt/trafficserver/bin/
+touch $RPM_BUILD_ROOT/etc/sysconfig/trafficserver
+cp ../trafficserver.env $RPM_BUILD_ROOT/etc/sysconfig/trafficserver
 mkdir -p "${RPM_BUILD_ROOT}"/var/log/trafficserver
 
 %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0}
@@ -124,6 +128,7 @@ fi
 %license LICENSE
 %defattr(-,root,root)
 %attr(644,-,-) /usr/lib/systemd/system/trafficserver.service
+%attr(644,-,-) /etc/sysconfig/trafficserver
 %dir /opt/trafficserver
 %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0}
 /opt/trafficserver/openssl