From c5e92b987b2461480093a9312db1c10bbca82b30 Mon Sep 17 00:00:00 2001
From: Filip Janus <fjanus@redhat.com>
Date: Mon, 7 Mar 2022 10:22:02 +0100
Subject: [PATCH] Enable fmf tests Add ci.fmf Remove old STI files release bump

---
 .fmf/version    |  1 +
 ci.fmf          | 10 ++++++++++
 postgresql.spec |  2 +-
 tests/tests.yml | 16 ----------------
 4 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 ci.fmf
 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..46aa480
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,10 @@
+/test:
+    summary:
+        Basic set of quick tests for postgresql.
+    discover:
+      - name: fedora
+        how: fmf
+        url: "https://src.fedoraproject.org/tests/postgresql.git"
+        ref: main
+    execute:
+        how: tmt
diff --git a/postgresql.spec b/postgresql.spec
index e9a99e5..a504c5e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -65,7 +65,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 14
 Version: %{majorversion}.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 7ba029d..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# This package uses external repositories for maintaining CI test cases.
-# Please don't edit this file if possible.
-
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    repositories:
-    - repo: https://src.fedoraproject.org/tests/postgresql.git
-      dest: postgresql
-      # TODO: minimize: https://pagure.io/standard-test-roles/issue/294
-      fmf_filter: "tier: 1"
-    # TODO: minimize: https://pagure.io/standard-test-roles/issue/294
-    tags:
-    - classic
-    - container
-    - atomic