Running with gitlab-runner 17.9.0 (c4cbe9dd)
  on AGR Lightweight runner on DO 9RF_wpNZh, system ID: s_a30377c9ccd3
section_start:1741436220:prepare_executor
Preparing the "docker+machine" executor
Using Docker executor with image registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2026dev2-package-source-builder ...
Authenticating with credentials from job payload (GitLab Registry)
Pulling docker image registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2026dev2-package-source-builder ...
Using docker image sha256:cca86042056025305192355aba4035eea3a502f5e04374e11f5230ba3ddae353 for registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2026dev2-package-source-builder with digest registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2026dev2-package-source-builder@sha256:e0e05bbdfb84dae21f0831bb8f9b1d8c1bb32ccbf1643f52be3809cb32fd81c7 ...
section_end:1741436225:prepare_executor
section_start:1741436225:prepare_script
Preparing environment
Running on runner-9rfwpnzh-project-4200-concurrent-0 via runner-9rfwpnzh-agr-light-1741435874-1aeeadad...
section_end:1741436225:prepare_script
section_start:1741436225:get_sources
Getting source from Git repository
Fetching changes...
Initialized empty Git repository in /builds/pkg/lintian/.git/
Created fresh repository.
Checking out ea2f0ef7 as detached HEAD (ref is debian/trixie)...

Skipping Git submodules setup
section_end:1741436230:get_sources
section_start:1741436230:step_script
Executing "step_script" stage of the job script
Using docker image sha256:cca86042056025305192355aba4035eea3a502f5e04374e11f5230ba3ddae353 for registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2026dev2-package-source-builder with digest registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2026dev2-package-source-builder@sha256:e0e05bbdfb84dae21f0831bb8f9b1d8c1bb32ccbf1643f52be3809cb32fd81c7 ...
$ if [ -d .git ] # collapsed multi-line command
/usr/bin/git
HEAD is now at ea2f0ef7 Import Debian version 2.121.1+nmu1
$ EXTRA_REPO_VERSION=${EXTRA_REPO_VERSION:-${CI_DEFAULT_BRANCH##$OSNAME/}}
$ if [ -n "${EXTRA_REPO_BASE_URL}" -a -n "${EXTRA_REPO_COMPONENTS}" ] # collapsed multi-line command
$ UPSTREAM_RELEASE=$(echo $CI_COMMIT_BRANCH | sed -E 's/-(security|updates|backports|proposed-updates)$//')
$ VAR_SUFFIX=$(echo $UPSTREAM_RELEASE | sed 's/\//_/g')
$ DOWNSTREAM_RELEASES_VAR=DOWNSTREAM_RELEASES_${VAR_SUFFIX}
$ AUTO_MERGE_ARG=""
$ if [ -z "$DOWNSTREAM_RELEASES" ] # collapsed multi-line command
Checking downstream targets in DOWNSTREAM_RELEASES_debian_trixie
$ if [ -z "$DOWNSTREAM_RELEASES" ] # collapsed multi-line command
Falling back to apertis/v2026dev2 as the downstream target
$ if [ -z "${PKG_UPDATES_AUTOMERGE_DISABLED}" ] && [ -n "${PKG_UPDATES_AUTOMERGE}" ] # collapsed multi-line command
Enabling auto merge of trivial changes for apertis/v2026dev2
$ if [ -n "${REBASE_RANGE}" ] # collapsed multi-line command
$ apertis-pkg-merge-upstream-to-downstreams --osname=${OSNAME} --upstream=${UPSTREAM_RELEASE} --downstreams=${DOWNSTREAM_RELEASES} --stable=${STABLE_RELEASES} --local-version-suffix=${PKG_VERSION_SUFFIX} ${REBASE_RANGE_ARG} ${AUTO_MERGE_ARG} ${CI_AUTH_PROJECT_URL}
branch 'debian/trixie' set up to track 'origin/debian/trixie'.
Setting branch apertis/v2026dev2 to point to apertis/v2026dev2 (7974203)
Looking at apertis/v2026dev2 <- debian/trixie
Attempt merging debian/trixie into apertis/v2026dev2 via proposed-updates/debian/trixie/79742038
branch 'debian/trixie' set up to track 'origin/debian/trixie'.
Auto-merging debian/changelog
Auto-merging debian/control
CONFLICT (content): Merge conflict in debian/control
Auto-merging debian/rules
CONFLICT (content): Merge conflict in debian/rules
Automatic merge failed; fix conflicts and then commit the result.
source package lintian
running git branch -f debian/trixie origin/debian/trixie
downstream apertis/v2026dev2 2.116.3+apertis6
upstream debian/trixie 2.121.1+nmu1
Merging from debian/trixie
🛑 Merge failed:


  RAN: /usr/bin/git merge debian/trixie --no-ff -m Merge updates from debian/trixie --stat

  STDOUT:


  STDERR:

Failed to merge debian/trixie into apertis/v2026dev2 via proposed-updates/debian/trixie/79742038
Submit proposed-updates/debian/trixie/79742038 for merging into apertis/v2026dev2 the updates from debian/trixie
Pushing proposed-updates/debian/trixie/79742038: Update from debian/trixie for apertis/v2026dev2
Minor change debian/trixie..proposed-updates/debian/trixie/79742038? True
Merge should be reviewed
Create merge request from 'proposed-updates/debian/trixie/79742038' to 'pkg/lintian/apertis/v2026dev2'
To https://gitlab.apertis.org/pkg/lintian.git/
 ! [rejected]          proposed-updates/debian/trixie/79742038 -> proposed-updates/debian/trixie/79742038 (non-fast-forward)
error: failed to push some refs to 'https://gitlab.apertis.org/pkg/lintian.git/'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you want to integrate the remote changes, use 'git pull'
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Traceback (most recent call last):
  File "/usr/bin/apertis-pkg-merge-upstream-to-downstreams", line 476, in <module>
    main()
    ~~~~^^
  File "/usr/bin/apertis-pkg-merge-upstream-to-downstreams", line 457, in main
    push_this_merge_request(auto_merge=auto_merge_override)
    ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/bin/apertis-pkg-merge-upstream-to-downstreams", line 253, in push_merge_request
    git_push_custom(
    ~~~~~~~~~~~~~~~^
        "-o",
        ^^^^^
    ...<11 lines>...
        _fg=True,
        ^^^^^^^^^
    )
    ^
  File "/usr/lib/python3/dist-packages/sh.py", line 1498, in __call__
    raise exc
sh.ErrorReturnCode_1: 

  RAN: /usr/bin/git push -o ci.skip -o merge_request.create -o merge_request.remove_source_branch -o merge_request.target=apertis/v2026dev2 -o merge_request.target_project=pkg/lintian -o merge_request.title=Update from debian/trixie for apertis/v2026dev2 https://not_a_robot:[MASKED]@gitlab.apertis.org/pkg/lintian.git/ proposed-updates/debian/trixie/79742038:proposed-updates/debian/trixie/79742038

  STDOUT:


  STDERR:

section_end:1741436233:step_script
section_start:1741436233:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1741436234:cleanup_file_variables
ERROR: Job failed: exit code 1