Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

During the rebase it is quite common to import a big list of packages to
satisfy dependencies flagged by germinate/obs. To make this process
smoother add a script to process a list of packages to call
import-debian-package tool.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

Fix comments on several rebase-scripts to help users to understand their
usage.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

Since the script is not really tight to germinate, rename it to show that.
In general, germinate specific scripts should be located in the germinate
repo.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

Improve the script to be able to run from different locations, to make
other workflows more straightforward.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

To make things tidy use the default rulez when forking packages for testing
a rebase.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

Some reports were not sorted, causing confusion, so let's sort them all.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

Instead of calling a new process to filter unique values use sort.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

Since the functionality of the script has been extended, rename it to
reflect that.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

In order to generate different types of report extend the script to
generate the list of all the build dependencies. In this other tools
can compute reports about the progress of the rebase.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

The check-for-dod can take long hours, so it is really useful to show
some hints about the progress.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

In order to be aware of errors which may not be noticed, just exit.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 4 weeks ago and Dylan Aïssi committed 1 day ago

To improve flexibility and align with other scripts pass the release as
argument.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 4 weeks ago and Dylan Aïssi committed 1 day ago

To retrieve all the information, extend the script to include all the
components. While doing that align in the name of the files used.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 1 month ago and Dylan Aïssi committed 1 day ago

Aligning with the rebase on top of Debian Trixie, switch the default
release to v2026dev2.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 1 month ago and Dylan Aïssi committed 1 day ago

To make the output for the script ready to be used for other script generate
a sorted list with unique source package names.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 2 weeks ago and Dylan Aïssi committed 1 day ago

The tool provides max-merges argument to limit the amount of data is
processed, but the functionality is not implemented. At the same time
the name of the argument is confusing, since the tools checks for missing
packages.

To fix the issue, implement a max limit with max-missing argument.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 2 weeks ago and Dylan Aïssi committed 1 day ago

To have more structured data, add json support.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 2 weeks ago and Dylan Aïssi committed 1 day ago

To be able to meassure the progress, show stats about the issues with
the missing packages.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 2 weeks ago and Dylan Aïssi committed 1 day ago

In situations of high load Gitlab might work as expected and several
pipelines can fail. In order to easily recover from this situation
add the support to retry them.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

A possible scenario during a rebase is that a package has no update, in
which case, usually the trigger-trivial argument allow the pipeline to
be created. However, for this to work the package need also to have
trivial changes, which means no delta.

In the case of a delta, it should be reviewed to make sure it is still
valid, however, this can be done later to unblock the rebase.

To support this behavior introduce a new argument to trigger a pipeline
when the package has no update. Also, add a log to allow to generate a
list of packages to be reviewed later.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 2 weeks ago and Dylan Aïssi committed 1 day ago

In order to easily understand the logs, restructure the entries to have,
showing MR first, and skipping useless data.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 3 weeks ago and Dylan Aïssi committed 1 day ago

A possible scenario during a rebase is that a package has no update, in
which case, usually the automerge-trivial argument allow the MR to be
merged. However, for this to work the package need also to have
trivial changes, which means no delta.

In the case of a delta, it should be reviewed to make sure it is still
valid, however, this can be done later to unblock the rebase.

To support this behavior introduce a new argument to automerge MR
when the package has no update. Also, add a log to allow to generate a
list of packages to be reviewed later.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Native packages don't have an upstream branch, so check its existence
before trying to branch from them.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

To make the code easy to read rename functions to show their real goal.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

After the change in the logic to execute actions during the scanning
move the code to make it easier to read.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

The current approach scans all the merge requests before starting to do any
action, which at first sight seems fine. However, the process of MR during
a rebase can take significant time, since the list is quite big, causing
the actions to be delayed after the scanning. Also, in the case of an error
during the scanning, no action is performed, which is a waste of time.

To make things better, execute the actions while the list of MR is being
processed.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

By default gitlab-rulez defines the default branch based on the
value of current_release_branch which is currently "apertis/v2026dev2".

But some packages have been dropped from Apertis in previous releases,
that means they don't have the default branch. Thus we need to teach
gitlab-rulez what is the latest branch to use as default branch.

mmc-utils was in the v2023_repositories list since its default
branch was apertis/v2023 because it got removed after.
Now that it has been re-added in apertis/v2024,
gitlab-rulez can rely on the current_release_branch to define its
default branch.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Otherwise RULES_UPDATE is inherited and wrong here.
Since branch-protection-tighten requires nothing from branch-protection-relax
it's cleaner to extend from rulez-check instead.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

To align with other variables and ensure we have set correctly this
variable.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Walter Lozano authored 1 month ago and Dylan Aïssi committed 4 weeks ago

To make the code easier to follow make the use of arguments consistent
across functions, avoiding mixing the use of command line arguments
directly inside functions.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

In order to have a more standard way to call gitlab api from command
line switch to python-gitlab.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

To make things more consistent and to show that now the rebase script can
be used in different scenarios like rebase testing and real rebase rename
it accordingly.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Since there is no need to rely on bash try to make the script more
compatible.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

The scripts used for the rebase testing have proven to be very useful
so we should use them in the real rebase. Currently the expectation is
to work in a different namespace to avoid messing with the production
repositories.

To allow them to be used for a real rebase, add an additional argument
to change the default behaviour in a forked repo to the production one.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

To make the script more readable move variables and functions to the
beginning.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

It's quite common that "upload" jobs fail when OBS is heavily busy.
Most of the time, it's enough to restart the pipeline to make the
build successful.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Walter Lozano authored 1 month ago and Dylan Aïssi committed 1 month ago

During the rebase lots of MR will be handled, so using labels makes it
easier to focus on the important packages.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 1 month ago and Dylan Aïssi committed 1 month ago

Since we are doing the actual rebase work on v2026dev2 switch to this
release as default.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

While creating new debian/ and upstream/ branches for a rebase,
we don't need to change the default branch which is already
correctly defined.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>