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>

Without this colon, the variable imgpath is not updated during branching.

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

Fix the check for the environment variable for Gitlab token.

Co-authored-by: Dylan Aïssi <dylan.aissi@collabora.com>
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

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

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

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

The functions in this library can be used in different use case so using
exit is not the best approach. Insted, use return and allow the calling
script to handle the error.

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

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

The api function has a very poor error handling, causing confusions, to
make things more clear, improve the error handling and provide better
messages.

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

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

This script severs as a collections of functions that are used by other
scripts, however, in some cases, some of these functions can be called
directly from command line. To make this use case simpler add a new script
which give access to the required functionality.

Adding a new wrapper script makes things less confusing, as it uses the
same approach that in other use cases, allowing to easy debug issues.

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

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

To follow good practices print errors to stderr, this is special important
on shell scripts since stdout is piped. While doing that fix typos in error
messages.

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

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

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

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

Since personal tokens are used across the script there is no much gain
in using trigger tokens. The problem with trigger tokens is that they
are per project, and when they expired or are revoked extra work is needed.

Also the current code was buggy since it does not properly handle the
creation of a new trigger token.

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

branching: create a merge request from branch-update-infrastructure instead of direcly pushing to main

This job push a commit to the repo where the branching pipeline is
currently running. Consequently, the actual branching pipeline
is cancel by a new dummy one based on the new commit. To avoid
cancelling the current pipeline, instead we create a merge request
that can be merged once the branching pipeline is completed to
avoid cancellation.

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

The main goal of the check-for-dod script is to help during the rebase to
identify missing packages so move it to the right folder.

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

Walter Lozano authored 3 months ago and Dylan Aïssi committed 2 months ago

Since the now we have a dedicated folder for rebase-scripts, move the scripts
used in the past to it.

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

Walter Lozano authored 3 months ago and Dylan Aïssi committed 2 months ago

In order to be able to test a rebase allow the scripts to support a Gitlab
group different that the default pkg.

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

Walter Lozano authored 3 months ago and Dylan Aïssi committed 2 months ago

Since the new rebase is for v2026 on top of Debian Trixie update the default
values of scripts.

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

Walter Lozano authored 4 months ago and Dylan Aïssi committed 4 months ago

Fix commit message use to branch tiny-image-recipes to match other cases.

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

Walter Lozano authored 4 months ago and Dylan Aïssi committed 4 months ago

The repo tiny-image-recipes has several settings related to Apertis release
which should not be changed, as the tests run a well known Apertis release
an on top an lxc container from the release under testing.

Fix the branching script accordingly.

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

Walter Lozano authored 4 months ago and Dylan Aïssi committed 4 months ago

Fix branch name when branching tiny-image-recipes.

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

These commands only read OBS projects configs without changing anything.
So, having the results of "cat osc_meta.txt" in dry mode is actually useful
to detect potential issues.

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

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

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

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

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

At this point, even if NEXT_RELEASE is a stable release, it hasn't yet
been released. So, the latest stable version released is currently PREV_STABLE_RELEASE.

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

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

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

branch-obs: split the creation of OBS repos for -security, -updates and -backports in two steps due to OBS constraints

OBS refuses to create repo with nonexistent dependencies and because
we have circular dependencies between target and development,
we first need to create repo without dependencies and later re-add
dependencies.

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

Walter Lozano authored 4 months ago and Dylan Aïssi committed 4 months ago

Stable releases are special as the the name is very similar to the preview
one. To properly check if the repo was already branched the check should
be done using full words and not only parts, if not the match will always
be true.

As a real example, when branching v2025 from v2025pre the check for v2025
will true as if not using full words.

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

Otherwise this variable is undefined but used later, thus the script
fails with:

./release-scripts/branch-obs: line 82: [: -ne: unary operator expected

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

Dylan Aïssi authored 5 months ago and Walter Lozano committed 4 months ago

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

Due to the issues with using + in the name of packages, like with gtk+2.0,
Apertis decided to replace + by - in several cases, which can be used as
default.

The current code took the approach of escaping the +, but that is not really
needed for the folding/branching process which rely on package names.

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

Fix the code to update infrastructure repo to match expectations.

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

Walter Lozano authored 6 months ago and Dylan Aïssi committed 6 months ago

Following the same approach done for other repos update gitlab-rulez.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 6 months ago

Since as_list will be deprecated soon, switch to the equivalent
iterator=True.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 6 months ago

To make it easier to read and to avoid code duplication move the obs copy
logic to its own script, following the same approach of other release
scripts.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 6 months ago

In order to avoid code duplication rework the scripts that handle repo
branching.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 7 months ago

To have early warnings add a check for env variables.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 7 months ago

To avoid continuing running commands in case of an error abort the
execution immediately.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 7 months ago

Drop the shift after the main case for arguments as it is bogus, and
triggers an error in case of multiple options like -g -o.

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

Walter Lozano authored 7 months ago and Dylan Aïssi committed 7 months ago

To align with other scripts support both NOACT env variable and dry-mode
from command line argument.

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