branches filter cause conflict between job definitions in diffent branches

Bug #1871866 reported by Takashi Kajinami on 2020-04-09
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
puppet-openstack-integration
High
Takashi Kajinami

Bug Description

Currently we use branches filter to define on which branch we should run the job.

However this filter makes job definition global instead of branch local,
and cause some problematic conflict between different branches.

For example now puppet-openstack-unit-5.5-centos-8 is non-voting in stable/train
while it is voting in master, but actually in master it is regarded as non-voting job
(this is addressed by this backport https://review.opendev.org/#/c/718585/ )

It is better to remove branches filter completely so that we can define job configuration
in each branch locally, to avoid such kind of unexpected conflicts.

Changed in puppet-openstack-integration:
assignee: nobody → Takashi Kajinami (kajinamit)
status: New → In Progress
Takashi Kajinami (kajinamit) wrote :

Submitted the fix to all available branches[1]

[1] https://review.opendev.org/#/q/topic:bug/1871866

Changed in puppet-openstack-integration:
importance: Undecided → High

Reviewed: https://review.opendev.org/718715
Committed: https://git.openstack.org/cgit/openstack/puppet-openstack-integration/commit/?id=918e548b5c8bd3f038652ff9b2a08330c8337f11
Submitter: Zuul
Branch: master

commit 918e548b5c8bd3f038652ff9b2a08330c8337f11
Author: Takashi Kajinami <email address hidden>
Date: Thu Apr 9 23:39:16 2020 +0900

    Remove all branches filter in zuul configuration

    ... to avoid conflict between stable branches, because adding branches
    make that job definition global one instead of branch specific one[1].

    [1] https://zuul-ci.org/docs/zuul/reference/job_def.html#attr-job.branches

    Closes-Bug: #1871866
    Change-Id: I4224ab2ca2d66cab1ba596760c6bb594ad1ce098

Changed in puppet-openstack-integration:
status: In Progress → Fix Released
tags: added: in-stable-train

Reviewed: https://review.opendev.org/718717
Committed: https://git.openstack.org/cgit/openstack/puppet-openstack-integration/commit/?id=fbfcc8a0fc52d680b4208bce6de5ee34acebf780
Submitter: Zuul
Branch: stable/train

commit fbfcc8a0fc52d680b4208bce6de5ee34acebf780
Author: Takashi Kajinami <email address hidden>
Date: Thu Apr 9 23:48:11 2020 +0900

    Remove all branches filter in zuul configuration

    ... to avoid conflict between stable branches, because adding branches
    make that job definition global one instead of branch specific one[1].

    [1] https://zuul-ci.org/docs/zuul/reference/job_def.html#attr-job.branches

    Closes-Bug: #1871866
    Change-Id: If09358e8248785cd5683f576f3b7d01aa33a0046

tags: added: in-stable-stein

Reviewed: https://review.opendev.org/718720
Committed: https://git.openstack.org/cgit/openstack/puppet-openstack-integration/commit/?id=4726c26f2722ea207ceff6fb26dedfb620e157b5
Submitter: Zuul
Branch: stable/stein

commit 4726c26f2722ea207ceff6fb26dedfb620e157b5
Author: Takashi Kajinami <email address hidden>
Date: Thu Apr 9 23:52:56 2020 +0900

    Remove all branches filter in zuul configuration

    ... to avoid conflict between stable branches, because adding branches
    make that job definition global one instead of branch specific one[1].

    [1] https://zuul-ci.org/docs/zuul/reference/job_def.html#attr-job.branches

    Closes-Bug: #1871866
    Change-Id: Ib5a2c782ce43d35271192710ecc9aacec7bd3b63

tags: added: in-stable-rocky

Reviewed: https://review.opendev.org/718723
Committed: https://git.openstack.org/cgit/openstack/puppet-openstack-integration/commit/?id=68a434e2bb9a8bbbcfe3877e0b089c01bbc3fb07
Submitter: Zuul
Branch: stable/rocky

commit 68a434e2bb9a8bbbcfe3877e0b089c01bbc3fb07
Author: Takashi Kajinami <email address hidden>
Date: Thu Apr 9 23:59:38 2020 +0900

    Remove all branches filter in zuul configuration

    ... to avoid conflict between stable branches, because adding branches
    make that job definition global one instead of branch specific one[1].

    [1] https://zuul-ci.org/docs/zuul/reference/job_def.html#attr-job.branches

    Closes-Bug: #1871866
    Change-Id: Ic52785c926a25f70b4471a4349727bf9b14a84cd

tags: added: in-stable-queens

Reviewed: https://review.opendev.org/718724
Committed: https://git.openstack.org/cgit/openstack/puppet-openstack-integration/commit/?id=314aaa550812d57d08be646410646ca127742916
Submitter: Zuul
Branch: stable/queens

commit 314aaa550812d57d08be646410646ca127742916
Author: Takashi Kajinami <email address hidden>
Date: Fri Apr 10 00:03:09 2020 +0900

    Remove all branches filter in zuul configuration

    ... to avoid conflict between stable branches, because adding branches
    make that job definition global one instead of branch specific one[1].

    [1] https://zuul-ci.org/docs/zuul/reference/job_def.html#attr-job.branches

    Closes-Bug: #1871866
    Change-Id: Ifb1910cafc799ad453252defd21c83deda939efc

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers