From 57d91b0b13edcc2bd211ebf7075824e597d76b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Fri, 26 Mar 2021 12:00:20 +0100
Subject: [PATCH] Ignore trailing projects from RC1

Some traiing projects follow the cycle-with-rc model however our doc
and our tools doesn't differentiate them during RC1. These project
doesn't have to be released during RC1. These changes adapt our process
accordingly.

Change-Id: I44040bc040f19a75c468d385395323fe0a1f459a
---
 doc/source/reference/process.rst |  8 ++++----
 tools/list_rc1.sh                | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100755 tools/list_rc1.sh

diff --git a/doc/source/reference/process.rst b/doc/source/reference/process.rst
index e1e636d6bd..549f433c91 100644
--- a/doc/source/reference/process.rst
+++ b/doc/source/reference/process.rst
@@ -1125,11 +1125,11 @@ R-3 week (RC1 deadline)
        --model cycle-with-intermediary \
        --type horizon-plugin --type other --type service --type tempest-plugin
 
-   - cycle-with-rc deliverables that have not done a RC1 yet, for which
-     a release should be proposed from HEAD, and include stable branch
-     creation. You can list those using::
+   - cycle-with-rc that are not trailing deliverables and that have not done
+     a RC1 yet, for which a release should be proposed from HEAD, and include
+     stable branch creation. You can list those using::
 
-       tox -e venv -- list-deliverables --missing-rc --model cycle-with-rc
+       tools/list_rc1.sh
 
    - Generate patches by using ``process_auto_releases``.
 
diff --git a/tools/list_rc1.sh b/tools/list_rc1.sh
new file mode 100755
index 0000000000..8ad30e9e4e
--- /dev/null
+++ b/tools/list_rc1.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Convenience wrapper to show cycle-with-rc non trailing deliverables that
+# have not done a RC1 yet, for which a release should be proposed from HEAD,
+# and include stable branch creation.
+
+TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+BASEDIR=$(dirname $TOOLSDIR)
+source $TOOLSDIR/functions
+
+if [[ -z "$VIRTUAL_ENV" ]]; then
+    if [[ ! -d $BASEDIR/.tox/venv ]]; then
+        (cd $BASEDIR && tox -e venv --notest)
+    fi
+    source $BASEDIR/.tox/venv/bin/activate
+fi
+
+# Figure out the current series from the releases directory.
+current_series=$(python -c 'import openstack_releases.defaults; \
+    print(openstack_releases.defaults.RELEASE)')
+if [ -z "$current_series" ]; then
+    echo "Could not determine the current release series."
+    exit 1
+fi
+
+trailing_projects=$(list-deliverables \
+    --missing-rc \
+    --model cycle-with-rc \
+    --type trailing)
+list-deliverables --missing-rc --model cycle-with-rc | \
+    grep -v "${trailing_projects}"