Showing logs for build greencapitaltrade/bifrost/pr-504 #1 stage from-build-pack and container prepare 2026/09/08 10:22:05 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-504 #1 stage from-build-pack and container place-scripts 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-0-2fpdx 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-1-j25ck 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-2-5t5nk 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-3-jfdt9 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-4-49cw5 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-6-gg6sl 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-7-tmlfq 2026/09/08 10:22:06 Decoded script /tekton/scripts/script-8-wcx64 Showing logs for build greencapitaltrade/bifrost/pr-504 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-504 #1 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/504/head:PR-504@e245d5c78e7988ab483f65c63f765e5f946ab945 to dir: source Cloning into 'source'... Updating files: 10% (2056/20502) Updating files: 11% (2256/20502) Updating files: 12% (2461/20502) Updating files: 13% (2666/20502) Updating files: 14% (2871/20502) Updating files: 15% (3076/20502) Updating files: 16% (3281/20502) Updating files: 17% (3486/20502) Updating files: 18% (3691/20502) Updating files: 19% (3896/20502) Updating files: 20% (4101/20502) Updating files: 21% (4306/20502) Updating files: 22% (4511/20502) Updating files: 22% (4610/20502) Updating files: 23% (4716/20502) Updating files: 24% (4921/20502) Updating files: 25% (5126/20502) Updating files: 26% (5331/20502) Updating files: 27% (5536/20502) Updating files: 28% (5741/20502) Updating files: 29% (5946/20502) Updating files: 30% (6151/20502) Updating files: 31% (6356/20502) Updating files: 32% (6561/20502) Updating files: 33% (6766/20502) Updating files: 34% (6971/20502) Updating files: 34% (7139/20502) Updating files: 35% (7176/20502) Updating files: 36% (7381/20502) Updating files: 37% (7586/20502) Updating files: 38% (7791/20502) Updating files: 39% (7996/20502) Updating files: 40% (8201/20502) Updating files: 41% (8406/20502) Updating files: 42% (8611/20502) Updating files: 43% (8816/20502) Updating files: 44% (9021/20502) Updating files: 44% (9140/20502) Updating files: 45% (9226/20502) Updating files: 46% (9431/20502) Updating files: 47% (9636/20502) Updating files: 48% (9841/20502) Updating files: 49% (10046/20502) Updating files: 50% (10251/20502) Updating files: 51% (10457/20502) Updating files: 52% (10662/20502) Updating files: 53% (10867/20502) Updating files: 54% (11072/20502) Updating files: 55% (11277/20502) Updating files: 56% (11482/20502) Updating files: 57% (11687/20502) Updating files: 58% (11892/20502) Updating files: 58% (11970/20502) Updating files: 59% (12097/20502) Updating files: 60% (12302/20502) Updating files: 61% (12507/20502) Updating files: 62% (12712/20502) Updating files: 63% (12917/20502) Updating files: 64% (13122/20502) Updating files: 65% (13327/20502) Updating files: 66% (13532/20502) Updating files: 67% (13737/20502) Updating files: 68% (13942/20502) Updating files: 69% (14147/20502) Updating files: 70% (14352/20502) Updating files: 71% (14557/20502) Updating files: 71% (14689/20502) Updating files: 72% (14762/20502) Updating files: 73% (14967/20502) Updating files: 74% (15172/20502) Updating files: 75% (15377/20502) Updating files: 76% (15582/20502) Updating files: 77% (15787/20502) Updating files: 78% (15992/20502) Updating files: 79% (16197/20502) Updating files: 80% (16402/20502) Updating files: 81% (16607/20502) Updating files: 82% (16812/20502) Updating files: 83% (17017/20502) Updating files: 84% (17222/20502) Updating files: 84% (17366/20502) Updating files: 85% (17427/20502) Updating files: 86% (17632/20502) Updating files: 87% (17837/20502) Updating files: 88% (18042/20502) Updating files: 89% (18247/20502) Updating files: 90% (18452/20502) Updating files: 91% (18657/20502) Updating files: 92% (18862/20502) Updating files: 93% (19067/20502) Updating files: 94% (19272/20502) Updating files: 95% (19477/20502) Updating files: 96% (19682/20502) Updating files: 97% (19887/20502) Updating files: 98% (20092/20502) Updating files: 98% (20250/20502) Updating files: 99% (20297/20502) Updating files: 100% (20502/20502) Updating files: 100% (20502/20502), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/504/head -> PR-504 Switched to branch 'PR-504' HEAD is now at e245d5c7 feat(asset): move the operator onto the asset's team on handover checked out revision: refs/pull/504/head:PR-504@e245d5c78e7988ab483f65c63f765e5f946ab945 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-504 #1 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:be6361b516da05fbe257a9db6609a54d7b35ce88,504:e245d5c78e7988ab483f65c63f765e5f946ab945:refs/pull/504/head using base branch main and base sha be6361b516da05fbe257a9db6609a54d7b35ce88 merging sha: e245d5c78e7988ab483f65c63f765e5f946ab945 error: error during merge: merging e245d5c78e7988ab483f65c63f765e5f946ab945 into main: failed to run 'git merge e245d5c78e7988ab483f65c63f765e5f946ab945' command in directory '.', output: 'Auto-merging addons/asset_management/models/asset.py Auto-merging addons/asset_management/models/asset_assignment.py CONFLICT (content): Merge conflict in addons/asset_management/models/asset_assignment.py Auto-merging addons/asset_management/tests/__init__.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.