From b6ca6e4837eeff823bbf4572de94fe0b1d90c8fb Mon Sep 17 00:00:00 2001 From: aticig Date: Tue, 7 Jun 2022 19:09:38 +0300 Subject: [PATCH] Extracting stage releasenotes script from stage-test.sh Release notes checking in stage-test.sh causes the failure in merge and revert jobs. So it is added as an separate script. Change-Id: Ie20878cb4822ba72e9d81f3e6ede8dcd1f65d99e Signed-off-by: aticig --- devops-stages/stage-releasenote.sh | 30 +++++++++++++++++++ devops-stages/stage-test.sh | 14 --------- ..._releasenotes_script-76f011decb1c9e16.yaml | 21 +++++++++++++ 3 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 devops-stages/stage-releasenote.sh create mode 100644 releasenotes/notes/extracting_releasenotes_script-76f011decb1c9e16.yaml diff --git a/devops-stages/stage-releasenote.sh b/devops-stages/stage-releasenote.sh new file mode 100644 index 00000000..e3ea365b --- /dev/null +++ b/devops-stages/stage-releasenote.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -e +echo "Checking the presence of release notes ..." + +nb_rn=$(git diff --diff-filter=A --name-only HEAD~1 |grep "releasenotes\/notes" |wc -l) +if [ "${nb_rn}" -lt 1 ]; then + echo "The commit needs release notes" + echo "Run the following command to generate release notes: tox -e release_notes ''" + echo "Please read README.md for more details" + exit 1 +elif [ "${nb_rn}" -gt 1 ]; then + echo "Only one release notes file should be added in a commit" + exit 1 +fi + +echo "OK. Release notes present in commit" diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh index 240ff987..0a6177a9 100755 --- a/devops-stages/stage-test.sh +++ b/devops-stages/stage-test.sh @@ -17,18 +17,4 @@ set -e echo "Launching tox" tox --parallel=auto -echo "Checking the presence of release notes ..." - -nb_rn=$(git diff --diff-filter=A --name-only HEAD~1 |grep "releasenotes\/notes" |wc -l) -if [ "${nb_rn}" -lt 1 ]; then - echo "The commit needs release notes" - echo "Run the following command to generate release notes: tox -e release_notes ''" - echo "Please read README.md for more details" - exit 1 -elif [ "${nb_rn}" -gt 1 ]; then - echo "Only one release notes file should be added in a commit" - exit 1 -fi - -echo "OK. Release notes present in commit" diff --git a/releasenotes/notes/extracting_releasenotes_script-76f011decb1c9e16.yaml b/releasenotes/notes/extracting_releasenotes_script-76f011decb1c9e16.yaml new file mode 100644 index 00000000..d43ef170 --- /dev/null +++ b/releasenotes/notes/extracting_releasenotes_script-76f011decb1c9e16.yaml @@ -0,0 +1,21 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +####################################################################################### +--- +other: + - | + Extracting stage releasenotes script from stage-test.sh. Release notes checking in + stage-test.sh causes the failure in merge and revert jobs.So it is added as an separate script. \ No newline at end of file -- 2.25.1