From ace90ce3382225d0aae2d3604c141c15aba48778 Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Tue, 26 Mar 2024 18:06:38 +0100 Subject: [PATCH] Gating configuration for c10s Setup of gating configuration for c10s/rhel-10 Modification of gating plan to select specific tests from Fedora Removal of redundant tests from the repo --- ci.fmf | 1 + gating.yaml | 8 ++-- plans/gating.fmf | 1 + tests/Sanity/licence-check/epel.repo | 30 ------------ tests/Sanity/licence-check/main.fmf | 12 ----- tests/Sanity/licence-check/test.sh | 69 ---------------------------- tests/main.fmf | 3 -- 7 files changed, 6 insertions(+), 118 deletions(-) delete mode 100644 tests/Sanity/licence-check/epel.repo delete mode 100644 tests/Sanity/licence-check/main.fmf delete mode 100755 tests/Sanity/licence-check/test.sh delete mode 100644 tests/main.fmf diff --git a/ci.fmf b/ci.fmf index c5aa0e0..24f8837 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1 +1,2 @@ +--- resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 116ac6c..058d0de 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,7 @@ --- !Policy product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build + - rhel-10 +decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build./plans/gating.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/gating.functional} diff --git a/plans/gating.fmf b/plans/gating.fmf index 5ed0c31..ce17d69 100644 --- a/plans/gating.fmf +++ b/plans/gating.fmf @@ -2,5 +2,6 @@ summary: CI Gating Plan discover: how: fmf filter: tag:gating + url: https://src.fedoraproject.org/rpms/python-jsonpointer execute: how: tmt diff --git a/tests/Sanity/licence-check/epel.repo b/tests/Sanity/licence-check/epel.repo deleted file mode 100644 index d52a962..0000000 --- a/tests/Sanity/licence-check/epel.repo +++ /dev/null @@ -1,30 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled = 0 -gpgcheck=1 -countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever -gpgcheck=1 diff --git a/tests/Sanity/licence-check/main.fmf b/tests/Sanity/licence-check/main.fmf deleted file mode 100644 index 163e41d..0000000 --- a/tests/Sanity/licence-check/main.fmf +++ /dev/null @@ -1,12 +0,0 @@ -summary: Chek for used licenses in packages -test: ./test.sh -link: - - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 - - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 -recommend: -- python-jsonpointer -- rpm-build -- license-validate -duration: 15m -tag: - - gating diff --git a/tests/Sanity/licence-check/test.sh b/tests/Sanity/licence-check/test.sh deleted file mode 100755 index f2ee4ab..0000000 --- a/tests/Sanity/licence-check/test.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE=python-jsonpointer -RPM=python3-jsonpointer -TCWD="$(pwd)" - -rlJournalStart - rlPhaseStartSetup - rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" - rlRun "pushd $tmp" - rlRun "set -o pipefail" - - # Ensure we have license tools available - EPELREPO= - if ! which license-fedora2spdx &>/dev/null; then - YUMPARAM= - if rlIsRHEL || rlIsCentOS; then - EPELREPO="/etc/yum.repos.d/$(basename ${tmp})" - rlRun "cp ${TCWD}/epel.repo ${EPELREPO}" - YUMPARAM="--enablerepo=epel" - else - rlDie "Can not find license-validate tool" - fi - rlRun "yum install -y ${YUMPARAM} license-validate" \ - || rlDie "Failed to install license-validate tool" - fi - - # Get list of rpms - #rlRun "yum download --source ${PACKAGE}" - rlFetchSrcForInstalled --quiet "${RPM}" || \ - rlDie 'Can not get source package of ${PACKAGE} .... giving up...' - SOURCEPKG=$(rpm -q --qf ${PACKAGE}'-%{version}-%{release}.src.rpm' ${RPM}) - rlAssertExists "${tmp}/${SOURCEPKG}" - rlRun "rpm -D '_topdir ${tmp}' -i ${tmp}/${SOURCEPKG}" - rlRun "LICENSES=\"\$(rpm -q --qf '%{license}\n' --specfile ${tmp}/SPECS/${PACKAGE}.spec\ - | sed -e 's/ and /\\n/g' -e 's/^ *//' -e 's/ *$//')\"" - rlRun "TUPLE=\"\$(rpm -q --qf '%{name} %{license}\n' \ - --specfile ${tmp}/SPECS/${PACKAGE}.spec )\"" - rlPhaseEnd - -while read l; do - rlPhaseStart FAIL "License check of ${l}" - retcode= - rlRun -s "license-validate '${l}'" || retcode=Fail - #rlAssertNotGrep 'Warning: ' "${rlRun_LOG}" \ - # || { rlLogInfo "$(cat ${rlRun_LOG})"; retcode="warn"; } - #rlAssertEquals "Check if the package license is SPDX identifier" \ - # "${l}" "$(cat ${rlRun_LOG})" || retcode="fail" - - # Report affected packages - if [[ -n "${retcode}" ]]; then - rlLogInfo "The following packages needs to fix the ${l} license:" - #for p in $(awk "\$0~/${l}/{print \$1;}" <<< "${TUPLE}"); do - for p in $(grep "${l}" <<< "${TUPLE}" | cut -d ' ' -f 1); do - rlLogInfo " - ${p}" - done - fi - rlPhaseEnd -done < <(sort -u <<< "${LICENSES}") - - rlPhaseStartCleanup - rlRun "popd" - # rlRun "rm -r $tmp" 0 "Remove tmp directory" - rlRun "yum clean metadata" - [[ -n "${EPELREPO}" ]] && rlRun "rm -f ${EPELREPO}" - rlPhaseEnd -rlJournalEnd diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index 11a0326..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,3 +0,0 @@ -contact: Jan Kuřík -component: python-jsonpointer -framework: beakerlib