[dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch

[dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch

[christian.ehrhardt]

From: Christian Ehrhardt <christian.ehrhardt@canonical.com>

To select the proper maintainers - as of today - we recommend to check
out the main branch in $STABLE_DIR before calling 3-request-backport.
But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
and thereby does not find any applied patch.

Instead we should use $RTE_VER_MAJOR that will correctly select the
branch name and therefore make 3-request-backport work in this case.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 3-request-backport | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3-request-backport b/3-request-backport
index a1725e5..67234d2 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -11,7 +11,7 @@ then
 	pushd $STABLE_DIR &>/dev/null
 	list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
 	_parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
-	_applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\  -f2-)
+	_applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\  -f2-)
 	for _file in $list
 	do
 		_sub=$(grep Subject $_file | cut -d\  -f3-)
-- 
2.32.0

[dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected

[christian.ehrhardt]

From: Christian Ehrhardt <christian.ehrhardt@canonical.com>

In the past we had a few "hey why did you try in the first place".
Since this is done based on the DPDK managed tool ./devtools/git-log-fixes.sh
discussions improvements and changes need to happen there and not on the
mail that that asks for backports.
Therefore mention the tool that selected the initial patch list in the
DPDK LTS process to guide everyone there as needed.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 3-request-backport | 1 +
 1 file changed, 1 insertion(+)

diff --git a/3-request-backport b/3-request-backport
index 67234d2..eafd31e 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -58,6 +58,7 @@ cat << EOF
 
 Hi commit authors (and maintainers),
 
+Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
 I didn't apply following commits from DPDK main to $stable_branch
 $(stable_or_lts) branch, as conflicts or build errors occur.
 
-- 
2.32.0

Re: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch

[Luca Boccassi]

On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> 
> To select the proper maintainers - as of today - we recommend to check
> out the main branch in $STABLE_DIR before calling 3-request-backport.
> But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
> and thereby does not find any applied patch.
> 
> Instead we should use $RTE_VER_MAJOR that will correctly select the
> branch name and therefore make 3-request-backport work in this case.
> 
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
>  3-request-backport | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/3-request-backport b/3-request-backport
> index a1725e5..67234d2 100755
> --- a/3-request-backport
> +++ b/3-request-backport
> @@ -11,7 +11,7 @@ then
>  	pushd $STABLE_DIR &>/dev/null
>  	list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
>  	_parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
> -	_applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\  -f2-)
> +	_applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\  -f2-)
>  	for _file in $list
>  	do
>  		_sub=$(grep Subject $_file | cut -d\  -f3-)

Acked-by: Luca Boccassi <bluca@debian.org>

-- 
Kind regards,
Luca Boccassi

Re: [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected

[Luca Boccassi]

On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> 
> In the past we had a few "hey why did you try in the first place".
> Since this is done based on the DPDK managed tool ./devtools/git-log-fixes.sh
> discussions improvements and changes need to happen there and not on the
> mail that that asks for backports.
> Therefore mention the tool that selected the initial patch list in the
> DPDK LTS process to guide everyone there as needed.
> 
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
>  3-request-backport | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/3-request-backport b/3-request-backport
> index 67234d2..eafd31e 100755
> --- a/3-request-backport
> +++ b/3-request-backport
> @@ -58,6 +58,7 @@ cat << EOF
>  
>  Hi commit authors (and maintainers),
>  
> +Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
>  I didn't apply following commits from DPDK main to $stable_branch
>  $(stable_or_lts) branch, as conflicts or build errors occur.

Acked-by: Luca Boccassi <bluca@debian.org>

-- 
Kind regards,
Luca Boccassi

Re: [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected

[Christian Ehrhardt]

On Tue, Aug 10, 2021 at 6:58 PM Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
> wrote:
> > From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> >
> > In the past we had a few "hey why did you try in the first place".
> > Since this is done based on the DPDK managed tool ./devtools/git-log-fixes.sh
> > discussions improvements and changes need to happen there and not on the
> > mail that that asks for backports.
> > Therefore mention the tool that selected the initial patch list in the
> > DPDK LTS process to guide everyone there as needed.
> >
> > Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> > ---
> >  3-request-backport | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/3-request-backport b/3-request-backport
> > index 67234d2..eafd31e 100755
> > --- a/3-request-backport
> > +++ b/3-request-backport
> > @@ -58,6 +58,7 @@ cat << EOF
> >
> >  Hi commit authors (and maintainers),
> >
> > +Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> >  I didn't apply following commits from DPDK main to $stable_branch
> >  $(stable_or_lts) branch, as conflicts or build errors occur.
>
> Acked-by: Luca Boccassi <bluca@debian.org>


Thanks, applied now

> --
> Kind regards,
> Luca Boccassi



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd

Re: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch

[Christian Ehrhardt]

On Tue, Aug 10, 2021 at 6:57 PM Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
> wrote:
> > From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> >
> > To select the proper maintainers - as of today - we recommend to check
> > out the main branch in $STABLE_DIR before calling 3-request-backport.
> > But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
> > and thereby does not find any applied patch.
> >
> > Instead we should use $RTE_VER_MAJOR that will correctly select the
> > branch name and therefore make 3-request-backport work in this case.
> >
> > Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> > ---
> >  3-request-backport | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/3-request-backport b/3-request-backport
> > index a1725e5..67234d2 100755
> > --- a/3-request-backport
> > +++ b/3-request-backport
> > @@ -11,7 +11,7 @@ then
> >       pushd $STABLE_DIR &>/dev/null
> >       list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
> >       _parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
> > -     _applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\  -f2-)
> > +     _applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\  -f2-)
> >       for _file in $list
> >       do
> >               _sub=$(grep Subject $_file | cut -d\  -f3-)
>
> Acked-by: Luca Boccassi <bluca@debian.org>

Thanks, applied now

> --
> Kind regards,
> Luca Boccassi



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd