From 686d35f333a1591ba2ef3ed8c30d68b431b5613a Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 25 Nov 2024 12:17:22 +0100 Subject: [PATCH] Migrate to TMT-style gating in C9S This is required for RHIVOS, see VROOM-23635. --- .fmf/version | 1 + ci.fmf | 2 + gating.yaml | 6 +- plans/public.fmf | 9 ++ plans/tier1-internal.fmf | 11 +++ .../Makefile | 62 -------------- .../PURPOSE | 5 -- .../runtest.sh | 50 ----------- .../Makefile | 63 -------------- .../PURPOSE | 5 -- .../runtest.sh | 58 ------------- .../Makefile | 61 -------------- .../PURPOSE | 5 -- .../runtest.sh | 82 ------------------- .../service-a-fake | 17 ---- .../service-b-fake | 16 ---- .../service-c-fake | 16 ---- tests/tests.retry | 1 - tests/tests.yml | 15 ---- 19 files changed, 26 insertions(+), 459 deletions(-) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 plans/public.fmf create mode 100644 plans/tier1-internal.fmf delete mode 100644 tests/alternatives-doesn-t-update-slave-links-with/Makefile delete mode 100644 tests/alternatives-doesn-t-update-slave-links-with/PURPOSE delete mode 100755 tests/alternatives-doesn-t-update-slave-links-with/runtest.sh delete mode 100644 tests/backport-family-option-from-upstream/Makefile delete mode 100644 tests/backport-family-option-from-upstream/PURPOSE delete mode 100755 tests/backport-family-option-from-upstream/runtest.sh delete mode 100644 tests/chkconfig-prioritory-set-inconsistently/Makefile delete mode 100644 tests/chkconfig-prioritory-set-inconsistently/PURPOSE delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/runtest.sh delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/service-a-fake delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/service-b-fake delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/service-c-fake delete mode 100644 tests/tests.retry delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..da71d9f --- /dev/null +++ b/ci.fmf @@ -0,0 +1,2 @@ +# Docs: https://docs.fedoraproject.org/en-US/ci/tmt/#_multiple_plans +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 01ac163..59e0fb8 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,7 @@ --- !Policy product_versions: - - rhel-9 + - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} diff --git a/plans/public.fmf b/plans/public.fmf new file mode 100644 index 0000000..d8892fe --- /dev/null +++ b/plans/public.fmf @@ -0,0 +1,9 @@ +summary: Public (upstream) beakerlib tests + +discover: + - name: fedora + how: fmf + url: https://github.com/fedora-sysv/chkconfig.git + +execute: + how: tmt diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf new file mode 100644 index 0000000..d462222 --- /dev/null +++ b/plans/tier1-internal.fmf @@ -0,0 +1,11 @@ +summary: Internal Tier 1 tests + +discover: + how: fmf + url: https://pkgs.devel.redhat.com/git/tests/chkconfig + filter: 'tier: 1 | tag: CI-Tier-1' +execute: + how: tmt +adjust: + enabled: false + when: distro == centos-stream or distro == fedora diff --git a/tests/alternatives-doesn-t-update-slave-links-with/Makefile b/tests/alternatives-doesn-t-update-slave-links-with/Makefile deleted file mode 100644 index b8f453d..0000000 --- a/tests/alternatives-doesn-t-update-slave-links-with/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -# Description: Test for BZ#1347541 (alternatives doesn't update slave links with) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -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) - -$(METADATA): Makefile - @echo "Owner: Jan Scotka " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1347541 (alternatives doesn't update slave links with)" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: chkconfig" >> $(METADATA) - @echo "Requires: chkconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1347541" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/alternatives-doesn-t-update-slave-links-with/PURPOSE b/tests/alternatives-doesn-t-update-slave-links-with/PURPOSE deleted file mode 100644 index 3c06b15..0000000 --- a/tests/alternatives-doesn-t-update-slave-links-with/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -Description: Test for BZ#1347541 (alternatives doesn't update slave links with) -Author: Jan Scotka -Bug summary: alternatives doesn't update slave links with --install in manual mode -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1347541 diff --git a/tests/alternatives-doesn-t-update-slave-links-with/runtest.sh b/tests/alternatives-doesn-t-update-slave-links-with/runtest.sh deleted file mode 100755 index 2c04dcc..0000000 --- a/tests/alternatives-doesn-t-update-slave-links-with/runtest.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -# Description: Test for BZ#1347541 (alternatives doesn't update slave links with) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="chkconfig" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlPhaseEnd - rlPhaseStartTest - - rlRun "alternatives --install /usr/bin/xxx xxx /usr/bin/true 1 --slave /usr/bin/yyy yyy /usr/bin/true" - rlRun "alternatives --set xxx /usr/bin/true" - rlRun "alternatives --install /usr/bin/xxx xxx /usr/bin/true 1 --slave /usr/bin/yyy yyy /usr/bin/false" - rlRun "readlink /etc/alternatives/yyy | grep /usr/bin/false" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "update-alternatives --remove xxx /usr/bin/true" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/backport-family-option-from-upstream/Makefile b/tests/backport-family-option-from-upstream/Makefile deleted file mode 100644 index 7eca1e2..0000000 --- a/tests/backport-family-option-from-upstream/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -# Description: Test for BZ#1291340 (Backport --family option from upstream) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -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) - - -$(METADATA): Makefile - @echo "Owner: Jan Scotka " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1291340 (Backport --family option from upstream)" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: chkconfig" >> $(METADATA) - @echo "Requires: chkconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1291340" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/backport-family-option-from-upstream/PURPOSE b/tests/backport-family-option-from-upstream/PURPOSE deleted file mode 100644 index 2b0fc3b..0000000 --- a/tests/backport-family-option-from-upstream/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -Description: Test for BZ#1291340 (Backport --family option from upstream) -Author: Jan Scotka -Bug summary: Backport --family option from upstream -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1291340 diff --git a/tests/backport-family-option-from-upstream/runtest.sh b/tests/backport-family-option-from-upstream/runtest.sh deleted file mode 100755 index d70cd8a..0000000 --- a/tests/backport-family-option-from-upstream/runtest.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -# Description: Test for BZ#1291340 (Backport --family option from upstream) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="chkconfig" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "touch $TmpDir/a" - rlRun "touch $TmpDir/b" - rlRun "ln -s $TmpDir/a $TmpDir/link" - rlPhaseEnd - - rlPhaseStartTest - rlRun "alternatives --install $TmpDir/link testname $TmpDir/a 1 --family testfamily" - rlRun "alternatives --install $TmpDir/link testname $TmpDir/b 2 --family testfamily" - rlRun "alternatives --display testname |grep 'link.*$TmpDir/b'" - rlRun "alternatives --display testname |grep 'link.*$TmpDir/a'" 1 - rlRun "alternatives --display testname |grep '$TmpDir/a.*testfamily priority 1'" - rlRun "alternatives --list | grep 'testname.*$TmpDir/b'" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun " alternatives --remove testname $TmpDir/a" - rlRun " alternatives --remove testname $TmpDir/b" - rlRun "rm -rf $TmpDir" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/chkconfig-prioritory-set-inconsistently/Makefile b/tests/chkconfig-prioritory-set-inconsistently/Makefile deleted file mode 100644 index 846e4c4..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -# Description: chkconfig-prioritory-set-inconsistently -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2012 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE service-a-fake service-b-fake service-c-fake - -.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) - -$(METADATA): Makefile - @echo "Owner: Martin Cermak " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: chkconfig-prioritory-set-inconsistently" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: chkconfig" >> $(METADATA) - @echo "Requires: chkconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 771455" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/chkconfig-prioritory-set-inconsistently/PURPOSE b/tests/chkconfig-prioritory-set-inconsistently/PURPOSE deleted file mode 100644 index 35babfd..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -Description: chkconfig-prioritory-set-inconsistently -Author: Martin Cermak -Bug summary: chkconfig S## prioritory set inconsistently for initscript with Requires-Start: $network -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=771455 diff --git a/tests/chkconfig-prioritory-set-inconsistently/runtest.sh b/tests/chkconfig-prioritory-set-inconsistently/runtest.sh deleted file mode 100755 index f8ff7c0..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/runtest.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -# Description: chkconfig-prioritory-set-inconsistently -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2012 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/lib/beakerlib/beakerlib.sh - -PACKAGE="chkconfig" - -myGetPriority() { - SERVICE=$1 - basename $( ls /etc/rc.d/rc3.d/S[0-9][0-9]$SERVICE ) | tr -d "[a-zA-Z\-]" -} - -# Test scenario: -# https://bugzilla.redhat.com/show_bug.cgi?id=771455#c0 - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "cp service-{a,b,c}-fake /etc/rc.d/init.d/" - - # A has Required-Start on B or C, thus the reversed order: - rlRun "/usr/lib/lsb/install_initd service-c-fake" - rlRun "/usr/lib/lsb/install_initd service-b-fake" - rlRun "/usr/lib/lsb/install_initd service-a-fake" - - rlRun "chkconfig service-a-fake off" - rlRun "chkconfig service-b-fake off" - rlRun "chkconfig service-c-fake off" - rlPhaseEnd - - rlPhaseStartTest - rlRun "chkconfig service-b-fake on" - rlRun "chkconfig service-a-fake on" - rlRun "PRIO=$( myGetPriority service-a-fake )" - # now, the priority of A should be >= 40 (should be = 40 in ideal world) - # and hopefully it is < 80 - rlRun "[ $PRIO -ge 40 ]" - rlRun "[ $PRIO -lt 80 ]" - - rlRun "chkconfig service-c-fake on" - rlRun "PRIO=$( myGetPriority service-a-fake )" - # MAIN TEST: - # right after enabling C, A should raise its priority above 80 - # this should fail with unpatched package (e.g. chkconfig-1.3.47-1.el6) - # ... and pass with patched one (e.g. chkconfig-1.3.49.3-2.el6) - rlRun "[ $PRIO -gt 80 ]" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "/usr/lib/lsb/remove_initd service-a-fake" - rlRun "/usr/lib/lsb/remove_initd service-b-fake" - rlRun "/usr/lib/lsb/remove_initd service-c-fake" - rlRun "rm -rf /etc/rc.d/init.d/service-{a,b,c}-fake" - rlPhaseEnd -#rlJournalPrintText -rlJournalEnd diff --git a/tests/chkconfig-prioritory-set-inconsistently/service-a-fake b/tests/chkconfig-prioritory-set-inconsistently/service-a-fake deleted file mode 100755 index a58fc46..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/service-a-fake +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# service-a-fake - -# chkconfig: 2345 40 89 -# description: Fake service a -# -### BEGIN INIT INFO -# Provides: service-a-fake -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Required-Start: bz771455fakeservice -# Short-Description: Fake service a -# Description: Fake service a -### END INIT INFO - - diff --git a/tests/chkconfig-prioritory-set-inconsistently/service-b-fake b/tests/chkconfig-prioritory-set-inconsistently/service-b-fake deleted file mode 100755 index c89d665..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/service-b-fake +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# service-b-fake - -# chkconfig: 2345 14 89 -# description: Fake service b -# -### BEGIN INIT INFO -# Provides: bz771455fakeservice -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Short-Description: Fake service b -# Description: Fake service b -### END INIT INFO - - diff --git a/tests/chkconfig-prioritory-set-inconsistently/service-c-fake b/tests/chkconfig-prioritory-set-inconsistently/service-c-fake deleted file mode 100755 index 7ee6216..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/service-c-fake +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# service-c-fake - -# chkconfig: 2345 80 89 -# description: Fake service c -# -### BEGIN INIT INFO -# Provides: bz771455fakeservice -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Short-Description: Fake service c -# Description: Fake service c -### END INIT INFO - - diff --git a/tests/tests.retry b/tests/tests.retry deleted file mode 100644 index 2fbb50c..0000000 --- a/tests/tests.retry +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 61bf9b4..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - tests: - - alternatives-doesn-t-update-slave-links-with - - backport-family-option-from-upstream - - chkconfig-prioritory-set-inconsistently - required_packages: - - chkconfig - - lsb