Skip to content

Commit 31e750e

Browse files
Fix PR build failure (sonic-net#11973)
Some PR builds fails to find this file. Remove it temporarily until we root cause it
1 parent a8b2a53 commit 31e750e

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

dockers/docker-fpm-frr/Dockerfile.j2

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ COPY ["TS", "/usr/bin/TS"]
5656
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
5757
COPY ["zsocket.sh", "/usr/bin/"]
5858
COPY ["*.json", "/etc/rsyslog.d/"]
59-
COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
59+
# COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
6060
RUN chmod a+x /usr/bin/TSA && \
6161
chmod a+x /usr/bin/TSB && \
6262
chmod a+x /usr/bin/TSC && \
6363
chmod a+x /usr/bin/zsocket.sh
6464

65-
RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin.conf.j2 /etc/rsyslog.d/events_info.json > /etc/rsyslog.d/bgp_events.conf
66-
RUN rm -f /etc/rsyslog.d/rsyslog_plugin.conf.j2*
65+
# RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin.conf.j2 /etc/rsyslog.d/events_info.json > /etc/rsyslog.d/bgp_events.conf
66+
# RUN rm -f /etc/rsyslog.d/rsyslog_plugin.conf.j2*
6767
RUN rm -f /etc/rsyslog.d/events_info.json*
6868

6969
ENTRYPOINT ["/usr/bin/docker_init.sh"]

files/build_templates/sonic_debian_extension.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,8 @@ sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_name
800800
sudo bash -c "echo } >> $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_names.json"
801801

802802
# copy rsyslog plugin binary for use by all dockers that use plugin to publish events.
803-
sudo mkdir -p ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}
804-
sudo cp ${files_path}/rsyslog_plugin ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/
803+
# sudo mkdir -p ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}
804+
# sudo cp ${files_path}/rsyslog_plugin ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/
805805

806806
{% for script in installer_start_scripts.split(' ') -%}
807807
if [ -f $TARGET_MACHINE"_{{script}}" ]; then

rules/docker-eventd.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ $(DOCKER_EVENTD)_PLUGIN = rsyslog_plugin
4343
$($(DOCKER_EVENTD)_PLUGIN)_PATH = $($(DOCKER_EVENTD)_FILESPATH)
4444

4545
SONIC_COPY_FILES += $($(DOCKER_EVENTD)_PLUGIN)
46-
$(DOCKER_EVENTD)_SHARED_FILES = $($(DOCKER_EVENTD)_PLUGIN)
46+
# Some builds fails to find this file. Remove until we root cause it.
47+
# $(DOCKER_EVENTD)_SHARED_FILES = $($(DOCKER_EVENTD)_PLUGIN)
4748

0 commit comments

Comments
 (0)