Merge tag 'v8.2112.0' of https://github.com/rsyslog/rsyslog into dev

v8.2112.0

.github/workflows/run_elasticsearch.yml

@@ -0,0 +1,48 @@
+# Copyright 2021 Rainer Gerhards and Others
+#
+# References:
+#
+# https://help.github.com/en/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-actions-notification-options
+# https://github.com/settings/notifications
+# https://software.opensuse.org//download.html?project=home%3Argerhards&package=rsyslog
+
+
+---
+name: check elasticsearch
+
+on:
+  pull_request:
+
+jobs:
+  check_run:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 20
+
+    steps:
+      - name: git checkout project
+        uses: actions/checkout@v1
+
+      - name: run container CI pipeline
+        run: |
+          chmod -R go+rw .
+          export RSYSLOG_CONFIGURE_OPTIONS_OVERRIDE="--enable-testbench --enable-omstdout \
+                 --enable-imdiag --enable-impstats --enable-imfile --disable-imfile-tests \
+                 --disable-fmhttp --enable-valgrind --disable-default-tests \
+                 --enable-elasticsearch-tests --enable-elasticsearch"
+          export RSYSLOG_CONTAINER_UID="" # use default
+          export RSYSLOG_STATSURL='http://build.rsyslog.com/testbench-failedtest.php'
+          export CC='gcc'
+          export CFLAGS='-g'
+          export USE_AUTO_DEBUG='off'
+          export CI_MAKE_OPT='-j20'
+          export CI_MAKE_CHECK_OPT='-j1'
+          export CI_CHECK_CMD='check'
+          export RSYSLOG_DEV_CONTAINER='rsyslog/rsyslog_dev_base_ubuntu:20.04'
+          export ABORT_ALL_ON_TEST_FAIL='NO'
+          devtools/devcontainer.sh --rm devtools/run-ci.sh
+
+      - name: show error logs (if we errored)
+        if:  ${{ failure() || cancelled() }}
+        run: |
+          devtools/gather-check-logs.sh
+          cat failed-tests.log

.github/workflows/run_fedora_34.yml

@@ -0,0 +1,59 @@
+# Copyright 2021 Rainer Gerhards and Others
+#
+# https://github.com/rsyslog/rsyslog-pkg-ubuntu
+#
+# Licensed 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
+#
+#     https://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.
+
+# References:
+#
+# https://help.github.com/en/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-actions-notification-options
+# https://github.com/settings/notifications
+# https://software.opensuse.org//download.html?project=home%3Argerhards&package=rsyslog
+
+
+---
+name: check fedora 34
+
+on:
+  pull_request:
+
+jobs:
+  check_run:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 50
+
+    steps:
+      - name: git checkout project
+        uses: actions/checkout@v1
+
+      - name: run container CI pipeline
+        run: |
+          chmod -R go+rw .
+          export RSYSLOG_CONTAINER_UID="" # use default
+          export RSYSLOG_STATSURL='http://build.rsyslog.com/testbench-failedtest.php'
+          export CFLAGS='-g'
+          export CC='gcc'
+          export USE_AUTO_DEBUG='off'
+          export CI_MAKE_OPT='-j20'
+          export CI_MAKE_CHECK_OPT='-j8'
+          export CI_CHECK_CMD='check'
+          export RSYSLOG_DEV_CONTAINER='rsyslog/rsyslog_dev_base_fedora:34'
+          export RSYSLOG_CONFIGURE_OPTIONS_EXTRA="--disable-elasticsearch-tests \
+                 --disable-kafka-tests --enable-debug"
+          devtools/devcontainer.sh --rm devtools/run-ci.sh
+
+      - name: show error logs (if we errored)
+        if:  ${{ failure() || cancelled() }}
+        run: |
+          devtools/gather-check-logs.sh
+          cat failed-tests.log

.github/workflows/run_ubuntu_20_distcheck.yml

@@ -55,5 +55,20 @@ jobs:
       - name: show error logs (if we errored)
         if:  ${{ failure() || cancelled() }}
         run: |
+          echo Some CI debugging in case we see permission errors again - remove when finally solved
+          echo PWD: $(pwd)
+          ls -la
+          ls -ld rsyslog-*
+          sudo chmod -R go+rw .
+          ls -la
+          ls -ld rsyslog-*
+          echo FIND ..:
+          find .. -name .dep_wrk
+          echo FIND:
+          find . -name .dep_wrk
+          echo ls of curr dir:
+          echo END CI DEBUGGING
+          rm -rf $(find . -name .dep_wrk)
+          sudo chmod -R a+r .
           devtools/gather-check-logs.sh
           cat failed-tests.log

.github/workflows/run_ubuntu_20_tsan.yml

@@ -31,6 +31,7 @@ jobs:
   check_run:
     runs-on: ubuntu-18.04
     timeout-minutes: 50
+    continue-on-error: true
 
     steps:
       - name: git checkout project
@@ -52,7 +53,7 @@ jobs:
           export CFLAGS="-g -fstack-protector -D_FORTIFY_SOURCE=2 -fsanitize=thread \
                     -O0 -fno-omit-frame-pointer -fno-color-diagnostics"
           export CI_SANITIZE_BLACKLIST='tests/tsan.supp'
-	  # note: we need pathes in container, thus /rsyslog vs. $(pwd) in TSAN_OPTIONS
+          # note: we need pathes in container, thus /rsyslog vs. $(pwd) in TSAN_OPTIONS
           export TSAN_OPTIONS="halt_on_error=1 suppressions=/rsyslog/tests/tsan-rt.supp"
           export ABORT_ALL_ON_TEST_FAIL='YES'
           # impstats has known and OK races