From e243ae37526644a86d39020ee92cb45ebafeaf5c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 31 May 2021 08:47:04 +0200 Subject: [PATCH] Add gating tests resolves: rhbz#1964594 --- gating.yaml | 9 ++++++ samba.spec | 2 +- tests/testparm/Makefile | 62 +++++++++++++++++++++++++++++++++++++++ tests/testparm/runtest.sh | 43 +++++++++++++++++++++++++++ tests/tests.yml | 13 ++++++++ 5 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 gating.yaml create mode 100644 tests/testparm/Makefile create mode 100644 tests/testparm/runtest.sh create mode 100644 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..c9f233e --- /dev/null +++ b/gating.yaml @@ -0,0 +1,9 @@ +# recipients: idmafs-qe, asn, ftrivino +--- !Policy +product_versions: + - rhel-8 +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} + - !PassingTestCaseRule {test_case_name: idm-ci.brew-build.tier1.functional} diff --git a/samba.spec b/samba.spec index 65ad9df..52e2a13 100644 --- a/samba.spec +++ b/samba.spec @@ -3894,7 +3894,7 @@ fi %endif %changelog -* Thu May 20 2021 Andreas Schneider - 4.14.4-6 +* Thu May 20 2021 Andreas Schneider - 4.14.4-7 - related: rhbz#1954531 - Fix build issues with gcc - resolves: rhbz#1959712 - Add iouring vfs module diff --git a/tests/testparm/Makefile b/tests/testparm/Makefile new file mode 100644 index 0000000..a15d611 --- /dev/null +++ b/tests/testparm/Makefile @@ -0,0 +1,62 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of gating test "testparm" +# Description: Basic config check for samba +# Author: Andrej Dzilsky +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 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=testparm +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile + +.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: Andrej Dzilsky " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Basic samba config check" >> $(METADATA) + @echo "Type: Regression" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: samba" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Bug: 1653890" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/testparm/runtest.sh b/tests/testparm/runtest.sh new file mode 100644 index 0000000..e2e32df --- /dev/null +++ b/tests/testparm/runtest.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of gating test "testparm" +# Description: Basic samba config check +# Author: Andrej Dzilsky +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 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 + +# From Andreas Schneider : +# This is a basic test which makes sure the samba is installed and the default +# smb.conf is available. + +rlJournalStart + + rlPhaseStartTest + rlRun "testparm -v -s" 0 "testparm ends with expected output" + rlPhaseEnd + +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..e775e71 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +# This first play always runs on the local staging system +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + tests: + - testparm + required_packages: + - samba + - samba-client + - samba-common