Enable CI for new MR's

Resolves: RHEL-608
This commit is contained in:
Patrik Koncity 2023-06-13 15:58:27 +02:00
parent 8c980ea7d2
commit 8d9c0baf25
8 changed files with 54 additions and 179 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

View File

@ -3,5 +3,4 @@ product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

View File

@ -5,7 +5,7 @@
Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog
Version: 8.2102.0
Release: 117%{?dist}
Release: 118%{?dist}
License: (GPLv3+ and ASL 2.0)
URL: http://www.rsyslog.com/
Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@ -579,6 +579,10 @@ done
%changelog
* Tue Sep 06 2023 Patrik Koncity <pkoncity@redhat.com> - 8.2102.0-118
- Add rsyslog CI for new MR in c9s
Resolves: RHEL-608
* Fri Jul 28 2023 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-117
- Add back CAP_NET_RAW capability due to omudpspoof
resolves: rhbz#2216919

View File

@ -1,64 +0,0 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /CoreOS/rsyslog/Sanity/various-simple-checks
# Description: various-simple-checks
# Author: Stefan Dordevic <sdordevi@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2017 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/CoreOS/rsyslog/Sanity/various-simple-checks
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
test -x runtest.sh || chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Stefan Dordevic <sdordevi@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: various-simple-checks" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "TestTime: 10m" >> $(METADATA)
@echo "RunFor: rsyslog" >> $(METADATA)
@echo "Requires: rsyslog" >> $(METADATA)
@echo "RhtsRequires: library(distribution/RpmSnapshot)" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: yes" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
rhts-lint $(METADATA)

View File

@ -1,3 +0,0 @@
PURPOSE of /CoreOS/rsyslog/Sanity/various-simple-checks
Description: various-simple-checks
Author: Stefan Dordevic <sdordevi@redhat.com>

View File

@ -1,89 +0,0 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/rsyslog/Sanity/various-simple-checks
# Description: initial-gating-check
# Author: Jiri Vymazal <jvymazal@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2017 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="rsyslog"
rlJournalStart
rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir"
rlLog "Import RpmSnapshot library"
rlRun "rlImport distribution/RpmSnapshot"
rlFileBackup "/var/log/messages"
rlFileBackup "/etc/rsyslog.conf"
rlRun "cp /etc/rsyslog.conf ."
rlServiceStop "rsyslog"
rlServiceStart "rsyslog"
rlPhaseEnd
rlPhaseStartTest "BZ#1399555"
rlAssertGrep "rsyslogd" /var/log/messages
rlAssertNotGrep "liblogging" /var/log/messages
rlPhaseEnd
rlPhaseStartTest "BZ#1399562"
rlServiceStop "rsyslog"
rlServiceStart "rsyslog"
rlAssertNotGrep "rsyslogd.*segfault" /var/log/messages
rlPhaseEnd
rlPhaseStartTest "BZ#1399652"
rlServiceStop "rsyslog"
rlServiceStart "rsyslog"
[ ! -f "/var/run/rsyslogd.pid" ] && rlFail "/var/run/rsyslogd.pid file not found"
[ -f "/var/run/syslogd.pid" ] && rlFail "/var/run/syslogd.pid file found"
pid_of=`pidof rsyslogd`
rlLogInfo "PID of rsyslogd: $pid_of"
pid_file=`cat /var/run/syslogd.pid`
rlLogInfo "PID in pidfile: $pid_file"
# dummy check
[ $pid_of -ne $pid_file ] && rlFail "PIDs are not the same"
rlPhaseEnd
rlPhaseStartTest "BZ#1410630"
rlRun "rsyslogd -N 1" 0 "\"rsyslogd -N 1\" should return 0"
rlLogInfo "set invalid configuration "
echo ":msg, eregex, \"^(Starting|Stopping) user-[0-9]+\.slice\" stop" >> /etc/rsyslog.conf
rlRun "rsyslogd -N 1" 1 "\"rsyslogd -N 1\" should return 1"
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
rlServiceStop "rsyslog"
sleep 2
rlFileRestore "/var/log/messages"
rlFileRestore "/etc/rsyslog.conf"
rlServiceStart "rsyslog"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

View File

@ -1,21 +0,0 @@
---
- hosts: localhost
tags: [ always ]
tasks:
- set_fact:
our_required_packages:
- rsyslog
- logrotate
- bash
- libestr
- systemd # for journal integration
- hosts: localhost
tags:
- classic
roles:
- role: standard-test-beakerlib
tests:
- initial-gating-check
required_packages: "{{ our_required_packages }}"

48
upstream_e2e.fmf Normal file
View File

@ -0,0 +1,48 @@
summary: Testing rsyslog essential test for CI
discover:
- how: fmf
url: https://github.com/RedHat-SP-Security/tests.git
ref: master
filter: component:rsyslog & tag:CI-Tier-1
test:
- /rsyslog/Sanity/basic-logging-facility/old-syntax
- /rsyslog/Sanity/bz1932795-rebase-to-2102
- /rsyslog/Sanity/bz672182-RFE-Provide-multi-line-message-capability/old-syntax
- /rsyslog/Sanity/bz672182-RFE-Provide-rate-limiting-support/new-syntax
- /rsyslog/Sanity/capabilities-drop
- /rsyslog/Sanity/config-enabled
- /rsyslog/Sanity/gnutls-openssl/interoperability
- /rsyslog/Sanity/gnutls-openssl/ossl
- /rsyslog/Sanity/imfile-module-test/new-syntax
- /rsyslog/Sanity/imfile-module-test/old-syntax
- /rsyslog/Sanity/imrelp-omrelp-module-test
- /rsyslog/Sanity/imtcp-module-test/old-syntax
- /rsyslog/Sanity/mmfields-module-test
- /rsyslog/Sanity/mmnormalize-module-test
# - /rsyslog/Sanity/omfile-module-test/newSyntax
# - /rsyslog/Sanity/omfile-module-test/oldSyntax
- /rsyslog/Sanity/ompipe-module-test
- /rsyslog/Sanity/omudpspoof-module-test
- /rsyslog/Sanity/test-various-configuration-directives/new-syntax
# - /rsyslog/Sanity/various-simple-checks
- /rsyslog/Regression/bz1419228-rsyslog-imjournal-module-no-longer-receives-logs
- /rsyslog/Regression/bz1763746-rsyslog-doesn-t-read-lines-from-imfile-after
- /rsyslog/Regression/bz1843992-rsyslog-dies-at-startup-when-imfile-top
- /rsyslog/Regression/bz1858297-Repeated-buffer-overflow-detected
- /rsyslog/Regression/bz1866877-parsing-msg
- /rsyslog/Regression/bz1880434-gnutls-shutdown
- /rsyslog/Regression/bz1886400-gnutls-shutdown-relp
- /rsyslog/Regression/bz1909639-imfile-leaves-state-files-behind
- /rsyslog/Regression/bz1944718-large-group
- /rsyslog/Regression/bz1960536-imjournal-fsync-fd-leak
- /rsyslog/Regression/bz1962318-errfile-maxsize
- /rsyslog/Regression/bz2052403-remove-wd-on-filemove
# - /rsyslog/Regression/bz654379-service-rsyslog-start-cat-hangs
#disable flaky test for now
execute:
how: tmt