From a8d849d42675b53e336e1095f7186c441559594b Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 23 May 2025 15:55:30 +0000
Subject: [PATCH] Make scripts DCO compliant

The OpenStack project will be switching from the OpenInfra
Individual Contributor License Agreement to the Developer
Certificate of Origin, which requires that commit messages include a
Signed-Off-By trailer. Any commits generated by automated tooling
will need to comply with this requirement as well. Simply including
git commit's -s option on the command line should be sufficient to
meet this requirement.

Change-Id: I46a6318d1257c65d573d289dbd597a2b301c1b97
---
 playbooks/proposal/propose_update.sh                          | 2 +-
 .../files/release-tools/add_release_note_page.sh              | 2 +-
 .../files/release-tools/change_reno_branch_to_unmaintained.sh | 2 +-
 .../copy-release-tools-scripts/files/release-tools/functions  | 4 ++--
 .../files/release-tools/update_constraints.sh                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/proposal/propose_update.sh b/playbooks/proposal/propose_update.sh
index 8e1580fc56..5fa03c8d5b 100755
--- a/playbooks/proposal/propose_update.sh
+++ b/playbooks/proposal/propose_update.sh
@@ -176,7 +176,7 @@ for PROJECT in $PROJECTS; do
         pushd $PROJECT_DIR
         if ! git diff --stat --exit-code HEAD ; then
             # Commit and review
-            git_args="-a -F-"
+            git_args="-a -F- -s"
             git commit $git_args <<EOF
 $COMMIT_MSG
 EOF
diff --git a/roles/copy-release-tools-scripts/files/release-tools/add_release_note_page.sh b/roles/copy-release-tools-scripts/files/release-tools/add_release_note_page.sh
index 42c81ca06b..9c20b1a5be 100755
--- a/roles/copy-release-tools-scripts/files/release-tools/add_release_note_page.sh
+++ b/roles/copy-release-tools-scripts/files/release-tools/add_release_note_page.sh
@@ -69,6 +69,6 @@ spaces=$(grep unreleased releasenotes/source/index.rst | sed -e 's/\w//g')
 sed --in-place -e "/unreleased/s/unreleased/unreleased\n${spaces}${SERIES}/" releasenotes/source/index.rst
 git add releasenotes/source/index.rst releasenotes/source/${SERIES}.rst
 git diff
-git commit -m "$commit_msg"
+git commit -m "$commit_msg" -s
 git show
 git review -t "reno-${SERIES}" --yes
diff --git a/roles/copy-release-tools-scripts/files/release-tools/change_reno_branch_to_unmaintained.sh b/roles/copy-release-tools-scripts/files/release-tools/change_reno_branch_to_unmaintained.sh
index f22d5f5d7a..e394308249 100755
--- a/roles/copy-release-tools-scripts/files/release-tools/change_reno_branch_to_unmaintained.sh
+++ b/roles/copy-release-tools-scripts/files/release-tools/change_reno_branch_to_unmaintained.sh
@@ -45,6 +45,6 @@ unmaintained/${SERIES}.
 sed --in-place -e "s/stable\/${SERIES}/unmaintained\/${SERIES}/" releasenotes/source/${SERIES}.rst
 git add releasenotes/source/${SERIES}.rst
 git diff
-git commit -m "$commit_msg"
+git commit -m "$commit_msg" -s
 git show
 git review -t "reno-eom-${SERIES}" --yes
diff --git a/roles/copy-release-tools-scripts/files/release-tools/functions b/roles/copy-release-tools-scripts/files/release-tools/functions
index 0c7484f3f9..67d043c851 100644
--- a/roles/copy-release-tools-scripts/files/release-tools/functions
+++ b/roles/copy-release-tools-scripts/files/release-tools/functions
@@ -66,7 +66,7 @@ function update_gitreview {
 defaultbranch=$branch"
     echo "$grcontents" > .gitreview
     git add .gitreview
-    git commit -m "Update .gitreview for $branch"
+    git commit -m "Update .gitreview for $branch" -s
     git show
     local shortbranch=$(basename $branch)
     git review -t "create-${shortbranch}" --yes
@@ -110,7 +110,7 @@ the requirements repository branches.
 
 Until the requirements repository has as $branch branch, tests will
 continue to use the upper-constraints list on master."
-        git commit -m "$msg" -m "$body"
+        git commit -m "$msg" -m "$body" -s
         git show
         local shortbranch=$(basename $branch)
         git review -t "create-${shortbranch}" --yes
diff --git a/roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh b/roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
index 835dde88e2..47bdfcf752 100755
--- a/roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
+++ b/roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
@@ -125,7 +125,7 @@ else
     if git commit -a -m "update constraint for $dist_name to new release $VERSION
 
 $TAG_META
-"; then
+" -s; then
         echo "Sleeping 10 minutes to avoid issues with the pypi cache"
         sleep 600
         git show