From 5d26dc6470d61db557c770024f5b1ae9971c4bba Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Wed, 10 Jul 2024 23:17:53 +0200
Subject: [PATCH] Update tests and gating.yaml

---
 gating.yaml              | 15 +++++++++------
 tests/upstream-tests.fmf |  7 +++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gating.yaml b/gating.yaml
index 3b56a2d..da7481a 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,16 +1,19 @@
+# Fedora
 --- !Policy
+id: fedora_policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_testing
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
 
-# Rawhide
+# RHEL
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
+  - rhel-*
+decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index cebbf27..7c32dd0 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -2,3 +2,10 @@ summary: Upstream tests
 component: perl-TimeDate
 require: perl-TimeDate-tests
 test: /usr/libexec/perl-TimeDate/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false