Showing logs for build greencapitaltrade/bifrost/pr-171 #3 stage from-build-pack and container prepare 2026/05/24 10:13:45 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-171 #3 stage from-build-pack and container place-scripts 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-0-vb9zw 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-1-j4w9m 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-2-xgbgg 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-3-gd6xl 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-4-k4jjf 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-6-kfj95 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-7-8b4f7 2026/05/24 10:13:47 Decoded script /tekton/scripts/script-8-phkv6 Showing logs for build greencapitaltrade/bifrost/pr-171 #3 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-171 #3 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/171/head:PR-171@4edeb70aec509eb08d00409d2de3f56d67b5aaee to dir: source Cloning into 'source'... Updating files: 18% (3654/20297) Updating files: 19% (3857/20297) Updating files: 20% (4060/20297) Updating files: 21% (4263/20297) Updating files: 22% (4466/20297) Updating files: 23% (4669/20297) Updating files: 24% (4872/20297) Updating files: 25% (5075/20297) Updating files: 26% (5278/20297) Updating files: 27% (5481/20297) Updating files: 28% (5684/20297) Updating files: 29% (5887/20297) Updating files: 30% (6090/20297) Updating files: 31% (6293/20297) Updating files: 32% (6496/20297) Updating files: 33% (6699/20297) Updating files: 34% (6901/20297) Updating files: 35% (7104/20297) Updating files: 36% (7307/20297) Updating files: 37% (7510/20297) Updating files: 37% (7544/20297) Updating files: 38% (7713/20297) Updating files: 39% (7916/20297) Updating files: 40% (8119/20297) Updating files: 41% (8322/20297) Updating files: 42% (8525/20297) Updating files: 43% (8728/20297) Updating files: 44% (8931/20297) Updating files: 45% (9134/20297) Updating files: 46% (9337/20297) Updating files: 47% (9540/20297) Updating files: 48% (9743/20297) Updating files: 49% (9946/20297) Updating files: 50% (10149/20297) Updating files: 51% (10352/20297) Updating files: 52% (10555/20297) Updating files: 53% (10758/20297) Updating files: 54% (10961/20297) Updating files: 55% (11164/20297) Updating files: 56% (11367/20297) Updating files: 57% (11570/20297) Updating files: 57% (11606/20297) Updating files: 58% (11773/20297) Updating files: 59% (11976/20297) Updating files: 60% (12179/20297) Updating files: 61% (12382/20297) Updating files: 62% (12585/20297) Updating files: 63% (12788/20297) Updating files: 64% (12991/20297) Updating files: 65% (13194/20297) Updating files: 66% (13397/20297) Updating files: 67% (13599/20297) Updating files: 68% (13802/20297) Updating files: 69% (14005/20297) Updating files: 70% (14208/20297) Updating files: 71% (14411/20297) Updating files: 72% (14614/20297) Updating files: 73% (14817/20297) Updating files: 74% (15020/20297) Updating files: 75% (15223/20297) Updating files: 76% (15426/20297) Updating files: 77% (15629/20297) Updating files: 78% (15832/20297) Updating files: 79% (16035/20297) Updating files: 80% (16238/20297) Updating files: 81% (16441/20297) Updating files: 82% (16644/20297) Updating files: 82% (16797/20297) Updating files: 83% (16847/20297) Updating files: 84% (17050/20297) Updating files: 85% (17253/20297) Updating files: 86% (17456/20297) Updating files: 87% (17659/20297) Updating files: 88% (17862/20297) Updating files: 89% (18065/20297) Updating files: 90% (18268/20297) Updating files: 91% (18471/20297) Updating files: 92% (18674/20297) Updating files: 93% (18877/20297) Updating files: 94% (19080/20297) Updating files: 95% (19283/20297) Updating files: 96% (19486/20297) Updating files: 97% (19689/20297) Updating files: 98% (19892/20297) Updating files: 99% (20095/20297) Updating files: 100% (20297/20297) Updating files: 100% (20297/20297), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/171/head -> PR-171 Switched to branch 'PR-171' HEAD is now at 4edeb70a test: pin /api/asset/geofences response shape (asset_ids + geometry) checked out revision: refs/pull/171/head:PR-171@4edeb70aec509eb08d00409d2de3f56d67b5aaee to dir: source Showing logs for build greencapitaltrade/bifrost/pr-171 #3 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:ff7787cb95af0bceb45030f17db7b459cc8eaab1,171:4edeb70aec509eb08d00409d2de3f56d67b5aaee:refs/pull/171/head using base branch main and base sha ff7787cb95af0bceb45030f17db7b459cc8eaab1 merging sha: 4edeb70aec509eb08d00409d2de3f56d67b5aaee error: error during merge: merging 4edeb70aec509eb08d00409d2de3f56d67b5aaee into main: failed to run 'git merge 4edeb70aec509eb08d00409d2de3f56d67b5aaee' command in directory '.', output: 'Auto-merging addons/asset_management/tests/__init__.py CONFLICT (content): Merge conflict in 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.