[gentoo-commits] proj/tatt:master commit in: templates/

[gentoo-commits] proj/tatt:master commit in: templates/

[Rolf Eike Beer]

commit:     a6f188af2dd06082b26db38d9eeffa7cd6aba38b
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Jan  2 20:59:10 2020 +0000
Commit:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
CommitDate: Thu Jan  2 21:00:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=a6f188af

collect more test logs

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>

 templates/tatt_functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index d2b5bc8..57d3d65 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -34,7 +34,7 @@ function tatt_pkg_error
     LOGNAME=$(mktemp -p "${TATT_BUILDLOGDIR}" "${CP/\//_}_${TATT_TEST_TYPE}_XXXXX")
     mv "${BUILDLOG}" "${LOGNAME}"
     echo "    log has been saved as ${LOGNAME}" >> "${TATT_REPORTFILE}"
-    TESTLOGS=($(find ${BUILDDIR}/work -name test-suite.log -o -name testsuite.log -o -name LastTest.log))
+    TESTLOGS=($(find ${BUILDDIR}/work -iname '*test*log*'))
     if [ ${#TESTLOGS[@]} -gt 0 ]; then
       tar cf ${LOGNAME}.tar ${TESTLOGS[@]}
       echo "    testsuite logs have been saved as ${LOGNAME}.tar" >> "${TATT_REPORTFILE}"

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     eafc7c666d773cfd3b8295474a24cb6eef0919ce
Author:     John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Feb 17 03:08:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 03:09:16 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=eafc7c66

templates/tatt_functions.sh: Don't use binpkgs when running the build test

This should force building the package even if
EMERGE_DEFAULT_OPTS has --usepkg=y or --getbinpkg=y, or if
FEATURES=getbinpkg.

Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/tatt/pull/71
Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/tatt_functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index 57d3d65..2893dc0 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -55,7 +55,7 @@ function tatt_test_pkg
     TFEATURES="${FEATURES}"
   fi
 
-  eout=$( FEATURES="${TFEATURES}" emerge -1 ${TATT_EMERGEOPTS} "${1:?}" 2>&1 1>/dev/tty )
+  eout=$( FEATURES="${TFEATURES}" emerge -1 --getbinpkg=n --usepkg-exclude="${1:?}" ${TATT_EMERGEOPTS} "${1:?}" 2>&1 1>/dev/tty )
   if [[ $? == 0 ]] ; then
     if [ -n "${TFEATURES}" ]; then
       echo -n "FEATURES='${TFEATURES}' " >> "${TATT_REPORTFILE}"

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     96a87558e37bc639a90ad17d4ffe07fc4bb2f30f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 00:20:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 00:20:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=96a87558

templates/tatt_functions.sh: pass package name (not atom) to --usepkg-exclude

Fixes: eafc7c666d773cfd3b8295474a24cb6eef0919ce
Fixes: https://github.com/gentoo/tatt/issues/72
Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/tatt_functions.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index 2893dc0..78b65ee 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -55,7 +55,9 @@ function tatt_test_pkg
     TFEATURES="${FEATURES}"
   fi
 
-  eout=$( FEATURES="${TFEATURES}" emerge -1 --getbinpkg=n --usepkg-exclude="${1:?}" ${TATT_EMERGEOPTS} "${1:?}" 2>&1 1>/dev/tty )
+  local name=$(portageq pquery "${1:?}" -n)
+
+  eout=$( FEATURES="${TFEATURES}" emerge -1 --getbinpkg=n --usepkg-exclude="${name}" ${TATT_EMERGEOPTS} "${1:?}" 2>&1 1>/dev/tty )
   if [[ $? == 0 ]] ; then
     if [ -n "${TFEATURES}" ]; then
       echo -n "FEATURES='${TFEATURES}' " >> "${TATT_REPORTFILE}"

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     ad209cde65eb56bc53fbe08106a6059daca1293b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 00:25:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 00:25:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=ad209cde

templates/tatt_functions.sh: add explanatory comment

See: 96a87558e37bc639a90ad17d4ffe07fc4bb2f30f
Bug: #72
Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/tatt_functions.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index 78b65ee..75f6ba4 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -55,6 +55,8 @@ function tatt_test_pkg
     TFEATURES="${FEATURES}"
   fi
 
+  # --usepkg-exclude needs the package name, so let's extract it
+  # from the atom we have
   local name=$(portageq pquery "${1:?}" -n)
 
   eout=$( FEATURES="${TFEATURES}" emerge -1 --getbinpkg=n --usepkg-exclude="${name}" ${TATT_EMERGEOPTS} "${1:?}" 2>&1 1>/dev/tty )

[gentoo-commits] proj/tatt:master commit in: templates/

[Rolf Eike Beer]

commit:     0a68e9fa39ed3de7caeeaa4f925b34e36eec2d97
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed May 19 15:40:20 2021 +0000
Commit:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
CommitDate: Wed May 19 15:40:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=0a68e9fa

templates/tatt_functions.sh: don't be too verbose when building test deps

Also correctly signal failure to the caller when this fails.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>

 templates/tatt_functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index 75f6ba4..0e95e9a 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -46,9 +46,9 @@ function tatt_test_pkg
 {
   if [ "${1:?}" == "--test" ]; then
     shift
-    if ! emerge --onlydeps -1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"; then
+    if ! emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"; then
       echo "merging test dependencies of ${1} failed" >> "${TATT_REPORTFILE}"
-      return 0
+      return 1
     fi
     TFEATURES="${FEATURES} test"
   else

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     b9b22135a5095cbcc4c26dc9573a0e677f2637f5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 22:04:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 22:04:00 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=b9b22135

tatt_functions.sh: avoid circular dependencies with USE="minimal -doc"

Emerge test dependencies with USE="minimal -doc" first. This should avoid circular
dependencies at least with a lot of dev-perl/* packages.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/tatt_functions.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index 0e95e9a..bd21e46 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -46,6 +46,11 @@ function tatt_test_pkg
 {
   if [ "${1:?}" == "--test" ]; then
     shift
+
+	# Do a first pass to avoid circular dependencies
+	# --onlydeps should mean we're avoiding (too much) duplicate work
+	USE="minimal -doc" emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"
+
     if ! emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"; then
       echo "merging test dependencies of ${1} failed" >> "${TATT_REPORTFILE}"
       return 1

[gentoo-commits] proj/tatt:master commit in: templates/

[Rolf Eike Beer]

commit:     5b0d77c02b3bf855fc6117f7ac736f3462694aeb
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Jun 28 15:09:10 2021 +0000
Commit:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
CommitDate: Mon Jun 28 15:12:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=5b0d77c0

tatt_functions.sh: keep original use flags when doing initial minimal build

Otherwise missing python_targets_* or ruby_targets_* may cause the build to fail
early.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>

 templates/tatt_functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index bd21e46..d4e7cdf 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -49,7 +49,7 @@ function tatt_test_pkg
 
 	# Do a first pass to avoid circular dependencies
 	# --onlydeps should mean we're avoiding (too much) duplicate work
-	USE="minimal -doc" emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"
+	USE="${USE} minimal -doc" emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"
 
     if ! emerge --onlydeps -q1 --with-test-deps ${TATT_EMERGEOPTS} "${1:?}"; then
       echo "merging test dependencies of ${1} failed" >> "${TATT_REPORTFILE}"

[gentoo-commits] proj/tatt:master commit in: templates/

[Rolf Eike Beer]

commit:     d930e543077f38007a34921506c1e09d5f42c9a0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Jul  4 15:43:26 2021 +0000
Commit:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
CommitDate: Sun Jul  4 15:43:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=d930e543

initialize the result var for revdep test scripts

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>

 templates/revdep-header | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/revdep-header b/templates/revdep-header
index 5731d5d..8148053 100644
--- a/templates/revdep-header
+++ b/templates/revdep-header
@@ -10,6 +10,8 @@ export TATT_EMERGEOPTS="@@EMERGEOPTS@@"
 
 source "@@TEMPLATEDIR@@tatt_functions.sh"
 
+test_ret=0
+
 export USE
 
 echo -e "revdep tests started on $(date)\n" >> @@REPORTFILE@@

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     f78714d5cb93f4f88e0dd0ddd592c76dc932c277
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 22:11:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 22:11:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=f78714d5

templates/tatt_functions.sh: create logs dir

Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/tatt_functions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index d4e7cdf..a672caf 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -31,6 +31,7 @@ function tatt_pkg_error
   BUILDDIR=/var/tmp/portage/${CP}
   BUILDLOG=${BUILDDIR}/temp/build.log
   if [[ -n "${TATT_BUILDLOGDIR}" && -s "${BUILDLOG}" ]]; then
+    mkdir -p "${TATT_BUILDLOGDIR}"
     LOGNAME=$(mktemp -p "${TATT_BUILDLOGDIR}" "${CP/\//_}_${TATT_TEST_TYPE}_XXXXX")
     mv "${BUILDLOG}" "${LOGNAME}"
     echo "    log has been saved as ${LOGNAME}" >> "${TATT_REPORTFILE}"

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     b300d2f02c89a0babe14ace86fb129075cf68faa
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 10:07:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 03:45:14 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=b300d2f0

Update commit and bug messages

According to this:
https://wiki.gentoo.org/wiki/Project:AMD64_Arch_Testers
"On Bugzilla, do not use the comment 'amd64 stable', use 'amd64 tested'
or 'amd64 ok' instead"

I looked at recent stabilization commits and bugs and I updated the
messages to match.

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
Closes: https://github.com/gentoo/tatt/pull/78
Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/commit-header | 6 +++---
 templates/updatebug     | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/templates/commit-header b/templates/commit-header
index 5b99e7a..867e624 100644
--- a/templates/commit-header
+++ b/templates/commit-header
@@ -2,11 +2,11 @@
 pushd @@REPODIR@@ > /dev/null
 
 if [ "@@NEWKEYWORD@@" = "@@ARCH@@" ]; then
-	DESCR="@@ARCH@@ stable"
+	DESCR="Stabilize @@ARCH@@"
 else
-	DESCR="@@ARCH@@ keyworded"
+	DESCR="Keyword @@ARCH@@"
 fi
 
 if [ -n "@@BUG@@" ]; then
-	DESCR="${DESCR} (bug #@@BUG@@)"
+	DESCR="${DESCR}, #@@BUG@@"
 fi

diff --git a/templates/updatebug b/templates/updatebug
index 548aa06..f17d653 100644
--- a/templates/updatebug
+++ b/templates/updatebug
@@ -37,10 +37,7 @@ def main():
 
 	# We don't close bugs which still have other arches for obvious reasons,
 	# and security bugs because stabilization is not the last step for them.
-	if '@@NEWKEYWORD@@' == '@@ARCH@@':
-		comment = "@@ARCH@@ stable"
-	else:
-		comment = "@@ARCH@@ keyworded"
+	comment = "@@ARCH@@ done"
 	params['cc'] = {}
 	if has_my_arch:
 		params['cc']['remove'] = ['@@ARCH@@@gentoo.org']
@@ -48,7 +45,7 @@ def main():
 	if has_other_arches or 'Security' in response['product']:
 		params['comment']['body'] = comment
 	else:
-		params['comment']['body'] = comment + ', closing'
+		params['comment']['body'] = comment + '\r\n\r\nall arches done'
 		params['status'] = 'RESOLVED'
 		params['resolution'] = 'FIXED'
 

[gentoo-commits] proj/tatt:master commit in: templates/

[Sam James]

commit:     cef1db7c4c2f5de261179999a1676588cd7742a8
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 10:07:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 03:45:14 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=cef1db7c

Replace repoman with pgkdev

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 templates/commit-snippet-2 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/commit-snippet-2 b/templates/commit-snippet-2
index 577db3b..93aed7b 100644
--- a/templates/commit-snippet-2
+++ b/templates/commit-snippet-2
@@ -1,7 +1,8 @@
 # Code for checking consistency of @@EBUILD@@
 pushd @@CP@@ > /dev/null
 
-repoman -d full || exit 1
-repoman -m "@@CP@@: ${DESCR}" commit || exit 1
+pkgcheck scan || exit 1
+git add @@EBUILD@@ || exit 1
+pkgdev commit -m "@@CP@@: ${DESCR}" --signoff || exit 1
 
 popd > /dev/null