Rebase with new dovecot

Resolves: #1987425

gating.yaml

@@ -4,6 +4,3 @@ product_versions:
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
-
-

imaptest.spec

@@ -1,11 +1,18 @@
+%global git_commit 19add789ce56e3046e1d7fc4968f9b86010b582c
+%global git_date 20210507
+
+%global git_short_commit %(echo %{git_commit} | cut -c -8)
+%global git_suffix %{git_date}git%{git_short_commit}
+
+
 Summary:        Generic IMAP server compliancy tester
 Name:           imaptest
 # Upstream is not really planning on adding version numbers
-Version:        20210305
+Version:        %{git_date}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        MIT
 URL:            https://www.imapwiki.org/ImapTest
-Source0:        https://dovecot.org/nightly/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/dovecot/%{name}/archive/%{git_commit}/%{name}-%{version}.tar.gz
 BuildRequires:  gcc, make, dovecot-devel >= 2.3.0
 BuildRequires:  autoconf, automake, libtool
 
@@ -20,7 +27,7 @@ verifies that server returns expected output.
 Examples and details are provided online at: https://www.imapwiki.org/ImapTest
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{git_commit}
 autoreconf -i
 
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1103927#c4 (and later)
@@ -42,11 +49,14 @@ $RPM_BUILD_ROOT%{_bindir}/%{name} --help
 
 %files
 %license COPYING COPYING.MIT
-%doc AUTHORS ChangeLog profile.conf pop3-profile.conf
+%doc AUTHORS NEWS profile.conf pop3-profile.conf
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Jul 29 2021 Pavel Zhukov <pzhukov@redhat.com> - 20210507-1
+- Rebuild with new dovecot
+
 * Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 20210305-3
 - Rebuilt for RHEL 9 BETA for openssl 3.0
   Related: rhbz#1971065

sources

@@ -1 +1 @@
-SHA512 (imaptest-20210305.tar.gz) = 7ff0a202172e0875806818f9a5806222534e0eb60f78577d7d0f1601ab330fab3f2cb23652383768092685e7dfa9a63eb2e1b9afbb68080772908f5cb8c839b6
+SHA512 (imaptest-20210507.tar.gz) = 146b42668bbb675d8f35c9259212af7a81fdd585a304cd7bba4ce3845a3b1c3ac84727a73d4c32aa2ebf186308cb7f47133bfd7a739c1fd8af6f4984b1aa5585

tests/imaptest-libdovector-integrity/Makefile

@@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of imaptest-libdovector-integrity
+#   Description: Test for imaptest with libdovecot
+#   Author: Pavel Zhukov <pavel@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2020 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=imaptest-libdovector-integrity
+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)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Pavel Zhukov <pavel@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for imaptest with libdovecot" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1m" >> $(METADATA)
+	@echo "RunFor:          imaptest" >> $(METADATA)
+	@echo "Requires:        imaptest" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             1776856" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/imaptest-libdovector-integrity/PURPOSE

@@ -0,0 +1,5 @@
+PURPOSE of imaptest-libdovector-integrity
+Description: Test for imaptest with libdovecot
+Author: Pavel Zhukov <pavel@redhat.com>
+Bug summary: imaptest must be rebuilt with new libdovecot
+Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1776856

tests/imaptest-libdovector-integrity/runtest.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh ofimaptest-libdovector-integrity
+#   Description: Test for imaptest with libdovecot
+#   Author: Pavel Zhukov <pavel@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2020 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
+
+PACKAGE="imaptest"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "imaptest --help"
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd

tests/tests.yml

@@ -0,0 +1,13 @@
+---
+# Tests that run in all contexts
+- hosts: localhost
+  vars:
+    use_beakerlib_libraries: true
+  roles:
+  - role: standard-test-rhts
+    tags:
+    - classic
+    tests:
+    - imaptest-libdovector-integrity
+    required_packages:
+    - findutils         # beakerlib needs find command