[dpdk-stable] [PATCH stable-scripts 2/2] Make failed_list and known_issues optional

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue Mar 17 11:19:14 CET 2020


From: Luca Boccassi <luca.boccassi at microsoft.com>

Some releases don't have them
---
 5-make-release-commit | 26 ++++++++++++++------------
 6-announce-release    | 19 ++++++++++---------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/5-make-release-commit b/5-make-release-commit
index 4926ab1..832e8e4 100755
--- a/5-make-release-commit
+++ b/5-make-release-commit
@@ -43,19 +43,21 @@ update_release_note()
 
 	echo "$(cat $stable_release/validation)"
 
-        echo
-        echo "$stable_release Known Issues"
-        echo "~~~~~~~~~~~~~~~~~~~~"
-        echo
+	if [ -e $stable_release/known_issues ]; then
+		echo
+		echo "$stable_release Known Issues"
+		echo "~~~~~~~~~~~~~~~~~~~~"
+		echo
+		echo "$(cat $stable_release/known_issues)"
+	fi
 
-	echo "$(cat $stable_release/known_issues)"
-
-        echo
-        echo "$stable_release Fixes skipped and status unresolved"
-        echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        echo
-
-	echo "$(cat $stable_release/failed_list)"
+	if [ -e $stable_release/failed_list ]; then
+		echo
+		echo "$stable_release Fixes skipped and status unresolved"
+		echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+		echo
+		echo "$(cat $stable_release/failed_list)"
+	fi
 
 	} >> $DPDK_DIR/doc/guides/rel_notes/release_${RTE_VER_MAJOR/./_}.rst
 }
diff --git a/6-announce-release b/6-announce-release
index 0a7a4fc..6d9fb86 100755
--- a/6-announce-release
+++ b/6-announce-release
@@ -2,13 +2,11 @@
 
 source ./lib.sh
 
-if [ $# -lt 1 ] || [ ! -f "$1" ]
+if [ $# -ge 1 ]
 then
-	echo "Usage: $0 failed_list"
-	exit 1
+	failed_list="/tmp/.list-$$"
+	grep -v "^#" $1 > $failed_list
 fi
-failed_list="/tmp/.list-$$"
-grep -v "^#" $1 > $failed_list
 
 get_diffs()
 {
@@ -44,7 +42,9 @@ EOF
 
 compose_release_note
 
-cat << EOF
+if [ $# -ge 1 ]
+then
+	cat << EOF
 ---[ List of missing patches ]---
 The following is the accumulated list of skipped patches. Authors/maintainers
 have not yet responded to backport requests. Actions to take per each patch,
@@ -53,6 +53,7 @@ have not yet responded to backport requests. Actions to take per each patch,
 	b) send out a backport to stable at dpdk.org
 
 EOF
-while read commit patch; do
-	describe_commit $commit
-done < $failed_list | sort -k 2
+	while read commit patch; do
+		describe_commit $commit
+	done < $failed_list | sort -k 2
+fi
-- 
2.20.1



More information about the stable mailing list