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>

Signed-off-by: Apertis CI <devel@lists.apertis.org>

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

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

After folding has been completed, it is worth to use the dashboard to
ensure that are no remaining issues. Previous checks are also useful,
but after the cleanup all the noise in the dashboard should have
disappeared, which makes easier to spot real issues.

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

The folding process can take more than one day so it is useful to
keep artifacts alive. Since artifacts are quite small set a rather
big expire time and the same time align with other instances.

Signed-off-by: Walter Lozano <walter.lozano@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 2 months ago

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

Walter Lozano authored 2 months ago and Dylan Aïssi committed 2 months 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 2 months 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 2 months 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 2 months 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 2 months ago

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

Walter Lozano authored 2 months ago and Dylan Aïssi committed 2 months 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>

To reduce the risk of issues while the protection is relaxed change the
approach from removing the protection completely to allow maintainers
to push directly.

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

By default, the branching pipeline will try to perform several jobs that
should not be part of a rebase. To support that, add a new configuration
to skip jobs during a rebase.

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

apertis-infrastructure-update: add new job reminding to merge the newly created MR against apertis-infrastructure

Signed-off-by: Dylan Aïssi <dylan.aissi@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>

branching: add new job ci-package-builder-update requesting to update ci-package-builder for stable release only

Adding the new release in a list DOWNSTREAM_RELEASES_debian_* ensures
the ci-package-builder pipeline will correctly assign merge requests
updating packages. Otherwise, the pipeline may create merge against
wrong branches.

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>

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>

After the folding it is important to check that pipelines in main branches
have run to ensure latest version are published. Make this clear in the
review step.

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

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

Walter Lozano authored 3 months ago and Dylan Aïssi committed 3 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 3 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 3 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>

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

Having manual jobs is very useful during folding and branching, however,
having manual jobs during testing is not useful and makes the process of
applying small changes rather painful.

To fully test the pipeline without relying in manual intervention run
manual jobs automatically during testing.

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

After the release work on thi Q update the list of pipelines to check
in the different scripts.

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

By passing an empty before_script and setting "GIT_STRATEGY: none".
Since we use only "echo" in these jobs, we can keep the job setup as basic as possible.

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

To avoid having out-of-date information in the wild and avoid giving the
impression that Apertis is no longer maintained.

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

Signed-off-by: Apertis CI <devel@lists.apertis.org>

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

Signed-off-by: Dylan Aïssi <dylan.aissi@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>