Showing logs for build greencapitaltrade/bifrost/pr-552 #1 stage from-build-pack and container prepare
2026/09/25 13:54:52 Entrypoint initialization

Showing logs for build greencapitaltrade/bifrost/pr-552 #1 stage from-build-pack and container place-scripts
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-0-nsjg9
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-1-qjwfw
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-2-4wbfp
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-3-tnwz9
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-4-cwxmg
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-6-5sdql
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-7-r4ntv
2026/09/25 13:54:53 Decoded script /tekton/scripts/script-8-z2wcz

Showing logs for build greencapitaltrade/bifrost/pr-552 #1 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/bifrost/pr-552 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/552/head:PR-552@322b9d8b3fa473a473953a866ce9e71a0f440e64 to dir: source
Cloning into 'source'...
Updating files:  23% (4873/20563)
Updating files:  24% (4936/20563)
Updating files:  25% (5141/20563)
Updating files:  26% (5347/20563)
Updating files:  27% (5553/20563)
Updating files:  28% (5758/20563)
Updating files:  29% (5964/20563)
Updating files:  30% (6169/20563)
Updating files:  31% (6375/20563)
Updating files:  32% (6581/20563)
Updating files:  33% (6786/20563)
Updating files:  34% (6992/20563)
Updating files:  35% (7198/20563)
Updating files:  36% (7403/20563)
Updating files:  37% (7609/20563)
Updating files:  38% (7814/20563)
Updating files:  39% (8020/20563)
Updating files:  40% (8226/20563)
Updating files:  41% (8431/20563)
Updating files:  42% (8637/20563)
Updating files:  43% (8843/20563)
Updating files:  44% (9048/20563)
Updating files:  45% (9254/20563)
Updating files:  46% (9459/20563)
Updating files:  46% (9622/20563)
Updating files:  47% (9665/20563)
Updating files:  48% (9871/20563)
Updating files:  49% (10076/20563)
Updating files:  50% (10282/20563)
Updating files:  51% (10488/20563)
Updating files:  52% (10693/20563)
Updating files:  53% (10899/20563)
Updating files:  54% (11105/20563)
Updating files:  55% (11310/20563)
Updating files:  56% (11516/20563)
Updating files:  57% (11721/20563)
Updating files:  58% (11927/20563)
Updating files:  59% (12133/20563)
Updating files:  60% (12338/20563)
Updating files:  61% (12544/20563)
Updating files:  62% (12750/20563)
Updating files:  63% (12955/20563)
Updating files:  64% (13161/20563)
Updating files:  65% (13366/20563)
Updating files:  66% (13572/20563)
Updating files:  67% (13778/20563)
Updating files:  68% (13983/20563)
Updating files:  69% (14189/20563)
Updating files:  70% (14395/20563)
Updating files:  71% (14600/20563)
Updating files:  72% (14806/20563)
Updating files:  73% (15011/20563)
Updating files:  73% (15163/20563)
Updating files:  74% (15217/20563)
Updating files:  75% (15423/20563)
Updating files:  76% (15628/20563)
Updating files:  77% (15834/20563)
Updating files:  78% (16040/20563)
Updating files:  79% (16245/20563)
Updating files:  80% (16451/20563)
Updating files:  81% (16657/20563)
Updating files:  82% (16862/20563)
Updating files:  83% (17068/20563)
Updating files:  84% (17273/20563)
Updating files:  85% (17479/20563)
Updating files:  86% (17685/20563)
Updating files:  87% (17890/20563)
Updating files:  88% (18096/20563)
Updating files:  89% (18302/20563)
Updating files:  90% (18507/20563)
Updating files:  91% (18713/20563)
Updating files:  92% (18918/20563)
Updating files:  93% (19124/20563)
Updating files:  94% (19330/20563)
Updating files:  95% (19535/20563)
Updating files:  96% (19741/20563)
Updating files:  97% (19947/20563)
Updating files:  98% (20152/20563)
Updating files:  99% (20358/20563)
Updating files: 100% (20563/20563)
Updating files: 100% (20563/20563), done.
From https://github.com/greencapitaltrade/bifrost
 * [new ref]           refs/pull/552/head -> PR-552
Switched to branch 'PR-552'
HEAD is now at 322b9d8b fix(asset-management): isolate cross-company team metadata
checked out revision: refs/pull/552/head:PR-552@322b9d8b3fa473a473953a866ce9e71a0f440e64 to dir: source

Showing logs for build greencapitaltrade/bifrost/pr-552 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:5b1a63e4fba0d7bb84a5915edbba3d65682b05f2,552:322b9d8b3fa473a473953a866ce9e71a0f440e64:refs/pull/552/head
using base branch main and base sha 5b1a63e4fba0d7bb84a5915edbba3d65682b05f2
merging sha: 322b9d8b3fa473a473953a866ce9e71a0f440e64
error: error during merge: merging 322b9d8b3fa473a473953a866ce9e71a0f440e64 into main: failed to run 'git merge 322b9d8b3fa473a473953a866ce9e71a0f440e64' command in directory '.', output: 'Auto-merging addons/asset_management/controllers/asset_team_api.py
CONFLICT (content): Merge conflict in addons/asset_management/controllers/asset_team_api.py
Auto-merging addons/asset_management/tests/test_team_dues_rollup.py
Automatic merge failed; fix conflicts and then commit the result.'

Pipeline failed on stage 'from-build-pack' : container 'step-git-merge'. The execution of the pipeline has stopped.