Showing logs for build greencapitaltrade/bifrost/pr-139 #6 stage from-build-pack and container prepare 2026/05/18 19:32:09 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-139 #6 stage from-build-pack and container place-scripts 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-0-74gfw 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-1-s9hgv 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-2-wvkqg 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-3-27b4l 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-4-sk4nr 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-6-fpssf 2026/05/18 19:32:55 Decoded script /tekton/scripts/script-7-t7sxt 2026/05/18 19:32:56 Decoded script /tekton/scripts/script-8-vj7k6 Showing logs for build greencapitaltrade/bifrost/pr-139 #6 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-139 #6 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/139/head:PR-139@ff35d0ac7f65e255edb146c61fd005c60873d820 to dir: source Cloning into 'source'... Updating files: 19% (4043/20294) Updating files: 20% (4059/20294) Updating files: 21% (4262/20294) Updating files: 22% (4465/20294) Updating files: 23% (4668/20294) Updating files: 24% (4871/20294) Updating files: 25% (5074/20294) Updating files: 26% (5277/20294) Updating files: 27% (5480/20294) Updating files: 28% (5683/20294) Updating files: 29% (5886/20294) Updating files: 30% (6089/20294) Updating files: 31% (6292/20294) Updating files: 32% (6495/20294) Updating files: 33% (6698/20294) Updating files: 34% (6900/20294) Updating files: 35% (7103/20294) Updating files: 36% (7306/20294) Updating files: 37% (7509/20294) Updating files: 38% (7712/20294) Updating files: 39% (7915/20294) Updating files: 39% (7939/20294) Updating files: 40% (8118/20294) Updating files: 41% (8321/20294) Updating files: 42% (8524/20294) Updating files: 43% (8727/20294) Updating files: 44% (8930/20294) Updating files: 45% (9133/20294) Updating files: 46% (9336/20294) Updating files: 47% (9539/20294) Updating files: 48% (9742/20294) Updating files: 49% (9945/20294) Updating files: 50% (10147/20294) Updating files: 51% (10350/20294) Updating files: 52% (10553/20294) Updating files: 53% (10756/20294) Updating files: 54% (10959/20294) Updating files: 55% (11162/20294) Updating files: 56% (11365/20294) Updating files: 57% (11568/20294) Updating files: 58% (11771/20294) Updating files: 59% (11974/20294) Updating files: 60% (12177/20294) Updating files: 61% (12380/20294) Updating files: 62% (12583/20294) Updating files: 63% (12786/20294) Updating files: 64% (12989/20294) Updating files: 65% (13192/20294) Updating files: 65% (13349/20294) Updating files: 66% (13395/20294) Updating files: 67% (13597/20294) Updating files: 68% (13800/20294) Updating files: 69% (14003/20294) Updating files: 70% (14206/20294) Updating files: 71% (14409/20294) Updating files: 72% (14612/20294) Updating files: 73% (14815/20294) Updating files: 74% (15018/20294) Updating files: 75% (15221/20294) Updating files: 76% (15424/20294) Updating files: 77% (15627/20294) Updating files: 78% (15830/20294) Updating files: 79% (16033/20294) Updating files: 80% (16236/20294) Updating files: 81% (16439/20294) Updating files: 82% (16642/20294) Updating files: 83% (16845/20294) Updating files: 84% (17047/20294) Updating files: 85% (17250/20294) Updating files: 86% (17453/20294) Updating files: 87% (17656/20294) Updating files: 88% (17859/20294) Updating files: 89% (18062/20294) Updating files: 90% (18265/20294) Updating files: 91% (18468/20294) Updating files: 92% (18671/20294) Updating files: 93% (18874/20294) Updating files: 93% (19052/20294) Updating files: 94% (19077/20294) Updating files: 95% (19280/20294) Updating files: 96% (19483/20294) Updating files: 97% (19686/20294) Updating files: 98% (19889/20294) Updating files: 99% (20092/20294) Updating files: 100% (20294/20294) Updating files: 100% (20294/20294), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/139/head -> PR-139 Switched to branch 'PR-139' HEAD is now at ff35d0ac fix(preview): fix gc-t.in.priority typo + drop Azure tolerations checked out revision: refs/pull/139/head:PR-139@ff35d0ac7f65e255edb146c61fd005c60873d820 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-139 #6 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:f09ce987f1f5863feb8ecb08f7a92e99bb72f1fb,139:ff35d0ac7f65e255edb146c61fd005c60873d820:refs/pull/139/head using base branch main and base sha f09ce987f1f5863feb8ecb08f7a92e99bb72f1fb merging sha: ff35d0ac7f65e255edb146c61fd005c60873d820 error: error during merge: merging ff35d0ac7f65e255edb146c61fd005c60873d820 into main: failed to run 'git merge ff35d0ac7f65e255edb146c61fd005c60873d820' command in directory '.', output: 'Auto-merging addons/asset_management/__manifest__.py Auto-merging addons/asset_management/controllers/asset_ble_token_api.py CONFLICT (add/add): Merge conflict in addons/asset_management/controllers/asset_ble_token_api.py Auto-merging addons/asset_management/models/asset_ble_token.py CONFLICT (add/add): Merge conflict in addons/asset_management/models/asset_ble_token.py Auto-merging addons/asset_management/models/asset_iot_device.py CONFLICT (content): Merge conflict in addons/asset_management/models/asset_iot_device.py Auto-merging addons/asset_management/tests/__init__.py CONFLICT (content): Merge conflict in addons/asset_management/tests/__init__.py Auto-merging addons/asset_management/tests/test_ble_token.py CONFLICT (add/add): Merge conflict in addons/asset_management/tests/test_ble_token.py Auto-merging addons/asset_management/tests/test_ble_token_server.py CONFLICT (add/add): Merge conflict in addons/asset_management/tests/test_ble_token_server.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.