From 6a222ae2d5ce94e3d1247ab5f6fde30517717852 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Sat, 18 Oct 2025 15:50:05 +0100
Subject: [PATCH] Add scripts to handle tagging of portable-based RPMs

Related: RHEL-118775
---
 java-1.8.0-openjdk.spec                |  2 ++
 scripts/builds/tag_rhel_8.sh           | 42 ++++++++++++++++++++++++++
 scripts/builds/tag_rhel_8_nocompose.sh | 42 ++++++++++++++++++++++++++
 scripts/builds/tag_rhel_9.sh           | 42 ++++++++++++++++++++++++++
 scripts/builds/tag_rhel_9_nocompose.sh | 42 ++++++++++++++++++++++++++
 5 files changed, 170 insertions(+)
 create mode 100755 scripts/builds/tag_rhel_8.sh
 create mode 100755 scripts/builds/tag_rhel_8_nocompose.sh
 create mode 100755 scripts/builds/tag_rhel_9.sh
 create mode 100755 scripts/builds/tag_rhel_9_nocompose.sh

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 582bedb..161beac 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -2961,8 +2961,10 @@ cjc.mainProgram(args)
 %changelog
 * Sat Oct 18 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.472.b08-2
 - Bump rpmrelease for CentOS build
+- Add scripts to handle tagging of portable-based RPMs
 - Related: RHEL-118767
 - Related: RHEL-119455
+- Related: RHEL-118775
 
 * Thu Oct 16 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.472.b08-1
 - Update to 8u472-b08 (GA).
diff --git a/scripts/builds/tag_rhel_8.sh b/scripts/builds/tag_rhel_8.sh
new file mode 100755
index 0000000..67be647
--- /dev/null
+++ b/scripts/builds/tag_rhel_8.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Copyright (C) 2025 Red Hat, Inc.
+# Written by:
+#     Andrew John Hughes <gnu.andrew@redhat.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tag RHEL 8 RPMs into all supported streams
+
+SUPPORTED_VERS="8.2.0-z 8.4.0-z 8.6.0-z 8.8.0-z 8.10.0-z"
+BUILD=${1}
+
+if test "${BUILD}" = ""; then
+    echo "${0} <BUILD>";
+    exit 1;
+fi
+
+for ver in ${SUPPORTED_VERS}; do
+    tag="rhel-${ver}-gate";
+    echo "Tagging ${BUILD} into ${tag}";
+    brew tag-build --nowait ${tag} ${BUILD};
+done
+brew watch-task --mine
+
+# Local Variables:
+# compile-command: "shellcheck tag_rhel_8.sh"
+# fill-column: 80
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# End:
diff --git a/scripts/builds/tag_rhel_8_nocompose.sh b/scripts/builds/tag_rhel_8_nocompose.sh
new file mode 100755
index 0000000..01efe69
--- /dev/null
+++ b/scripts/builds/tag_rhel_8_nocompose.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Copyright (C) 2025 Red Hat, Inc.
+# Written by:
+#     Andrew John Hughes <gnu.andrew@redhat.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tag embargoed RHEL 8 RPMs into supported z-streams
+
+SUPPORTED_VERS="8.2.0-z 8.4.0-z 8.6.0-z 8.8.0-z 8.10.0-z"
+BUILD=${1}
+
+if test "${BUILD}" = ""; then
+    echo "${0} <BUILD>";
+    exit 1;
+fi
+
+for ver in ${SUPPORTED_VERS}; do
+    tag="rhel-${ver}-nocompose-candidate";
+    echo "Tagging ${BUILD} into ${tag}";
+    brew tag-build --nowait ${tag} ${BUILD};
+done
+brew watch-task --mine
+
+# Local Variables:
+# compile-command: "shellcheck tag_rhel_8_nocompose.sh"
+# fill-column: 80
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# End:
diff --git a/scripts/builds/tag_rhel_9.sh b/scripts/builds/tag_rhel_9.sh
new file mode 100755
index 0000000..fa3c3ef
--- /dev/null
+++ b/scripts/builds/tag_rhel_9.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Copyright (C) 2025 Red Hat, Inc.
+# Written by:
+#     Andrew John Hughes <gnu.andrew@redhat.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tag RHEL 9 RPMs into all supported streams
+
+SUPPORTED_VERS="9.0.0-z 9.2.0-z 9.4.0-z 9.6.0-z 9.7.0-z 9.8.0"
+BUILD=${1}
+
+if test "${BUILD}" = ""; then
+    echo "${0} <BUILD>";
+    exit 1;
+fi
+
+for ver in ${SUPPORTED_VERS}; do
+    tag="rhel-${ver}-gate";
+    echo "Tagging ${BUILD} into ${tag}";
+    brew tag-build --nowait ${tag} ${BUILD};
+done
+brew watch-task --mine
+
+# Local Variables:
+# compile-command: "shellcheck tag_rhel_9.sh"
+# fill-column: 80
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# End:
diff --git a/scripts/builds/tag_rhel_9_nocompose.sh b/scripts/builds/tag_rhel_9_nocompose.sh
new file mode 100755
index 0000000..3bd6978
--- /dev/null
+++ b/scripts/builds/tag_rhel_9_nocompose.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Copyright (C) 2025 Red Hat, Inc.
+# Written by:
+#     Andrew John Hughes <gnu.andrew@redhat.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tag embargoed RHEL 9 RPMs into supported z-streams
+
+SUPPORTED_VERS="9.0.0-z 9.2.0-z 9.4.0-z 9.6.0-z"
+BUILD=${1}
+
+if test "${BUILD}" = ""; then
+    echo "${0} <BUILD>";
+    exit 1;
+fi
+
+for ver in ${SUPPORTED_VERS}; do
+    tag="rhel-${ver}-nocompose-candidate";
+    echo "Tagging ${BUILD} into ${tag}";
+    brew tag-build --nowait ${tag} ${BUILD};
+done
+brew watch-task --mine
+
+# Local Variables:
+# compile-command: "shellcheck tag_rhel_9_nocompose.sh"
+# fill-column: 80
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# End: