Showing logs for build greencapitaltrade/bifrost/pr-71 #6 stage from-build-pack and container prepare 2026/03/19 14:58:03 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-71 #6 stage from-build-pack and container place-scripts 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-0-fkcm6 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-1-gkfpl 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-2-nf45x 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-3-vg5dp 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-4-xxblc 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-6-tfn7c 2026/03/19 14:58:03 Decoded script /tekton/scripts/script-7-qrwnc 2026/03/19 14:58:04 Decoded script /tekton/scripts/script-8-44pvd Showing logs for build greencapitaltrade/bifrost/pr-71 #6 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-71 #6 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/71/head:PR-71@bb888d1b62767bf4b062b9bb7fb5811afcaf371e to dir: source Cloning into 'source'... Updating files: 8% (1730/20299) Updating files: 9% (1827/20299) Updating files: 10% (2030/20299) Updating files: 11% (2233/20299) Updating files: 12% (2436/20299) Updating files: 13% (2639/20299) Updating files: 14% (2842/20299) Updating files: 15% (3045/20299) Updating files: 16% (3248/20299) Updating files: 17% (3451/20299) Updating files: 18% (3654/20299) Updating files: 19% (3857/20299) Updating files: 20% (4060/20299) Updating files: 21% (4263/20299) Updating files: 22% (4466/20299) Updating files: 23% (4669/20299) Updating files: 24% (4872/20299) Updating files: 25% (5075/20299) Updating files: 26% (5278/20299) Updating files: 27% (5481/20299) Updating files: 28% (5684/20299) Updating files: 29% (5887/20299) Updating files: 30% (6090/20299) Updating files: 31% (6293/20299) Updating files: 32% (6496/20299) Updating files: 32% (6569/20299) Updating files: 33% (6699/20299) Updating files: 34% (6902/20299) Updating files: 35% (7105/20299) Updating files: 36% (7308/20299) Updating files: 37% (7511/20299) Updating files: 38% (7714/20299) Updating files: 39% (7917/20299) Updating files: 40% (8120/20299) Updating files: 41% (8323/20299) Updating files: 42% (8526/20299) Updating files: 43% (8729/20299) Updating files: 44% (8932/20299) Updating files: 45% (9135/20299) Updating files: 46% (9338/20299) Updating files: 47% (9541/20299) Updating files: 48% (9744/20299) Updating files: 49% (9947/20299) Updating files: 50% (10150/20299) Updating files: 51% (10353/20299) Updating files: 51% (10465/20299) Updating files: 52% (10556/20299) Updating files: 53% (10759/20299) Updating files: 54% (10962/20299) Updating files: 55% (11165/20299) Updating files: 56% (11368/20299) Updating files: 57% (11571/20299) Updating files: 58% (11774/20299) Updating files: 59% (11977/20299) Updating files: 60% (12180/20299) Updating files: 61% (12383/20299) Updating files: 62% (12586/20299) Updating files: 63% (12789/20299) Updating files: 64% (12992/20299) Updating files: 65% (13195/20299) Updating files: 66% (13398/20299) Updating files: 67% (13601/20299) Updating files: 68% (13804/20299) Updating files: 68% (13851/20299) Updating files: 69% (14007/20299) Updating files: 70% (14210/20299) Updating files: 71% (14413/20299) Updating files: 72% (14616/20299) Updating files: 73% (14819/20299) Updating files: 74% (15022/20299) Updating files: 75% (15225/20299) Updating files: 76% (15428/20299) Updating files: 77% (15631/20299) Updating files: 78% (15834/20299) Updating files: 79% (16037/20299) Updating files: 80% (16240/20299) Updating files: 81% (16443/20299) Updating files: 82% (16646/20299) Updating files: 83% (16849/20299) Updating files: 84% (17052/20299) Updating files: 85% (17255/20299) Updating files: 86% (17458/20299) Updating files: 87% (17661/20299) Updating files: 88% (17864/20299) Updating files: 89% (18067/20299) Updating files: 90% (18270/20299) Updating files: 91% (18473/20299) Updating files: 92% (18676/20299) Updating files: 93% (18879/20299) Updating files: 94% (19082/20299) Updating files: 94% (19215/20299) Updating files: 95% (19285/20299) Updating files: 96% (19488/20299) Updating files: 97% (19691/20299) Updating files: 98% (19894/20299) Updating files: 99% (20097/20299) Updating files: 100% (20299/20299) Updating files: 100% (20299/20299), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/71/head -> PR-71 Switched to branch 'PR-71' HEAD is now at bb888d1b feat(api): include GPS location in vehicle list and detail API responses checked out revision: refs/pull/71/head:PR-71@bb888d1b62767bf4b062b9bb7fb5811afcaf371e to dir: source Showing logs for build greencapitaltrade/bifrost/pr-71 #6 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:b902504df22a65e0e9adb214b754eadedaee9376,71:bb888d1b62767bf4b062b9bb7fb5811afcaf371e:refs/pull/71/head using base branch main and base sha b902504df22a65e0e9adb214b754eadedaee9376 merging sha: bb888d1b62767bf4b062b9bb7fb5811afcaf371e error: error during merge: merging bb888d1b62767bf4b062b9bb7fb5811afcaf371e into main: failed to run 'git merge bb888d1b62767bf4b062b9bb7fb5811afcaf371e' command in directory '.', output: 'Auto-merging addons/fleet_management/controllers/fleet_vehicle_api.py CONFLICT (content): Merge conflict in addons/fleet_management/controllers/fleet_vehicle_api.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.