Showing logs for build greencapitaltrade/bifrost/pr-673 #7 stage from-build-pack and container prepare 2026/10/01 20:23:40 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-673 #7 stage from-build-pack and container place-scripts 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-0-v4swq 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-1-zv2rv 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-2-hchgm 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-3-mm279 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-4-4k4zs 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-6-d6wjx 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-7-grzmj 2026/10/01 20:23:41 Decoded script /tekton/scripts/script-8-xdkfd Showing logs for build greencapitaltrade/bifrost/pr-673 #7 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-673 #7 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/673/head:PR-673@58702f91424de3a1253d64a7175748664436d558 to dir: source Cloning into 'source'... Updating files: 18% (3876/20592) Updating files: 19% (3913/20592) Updating files: 20% (4119/20592) Updating files: 21% (4325/20592) Updating files: 22% (4531/20592) Updating files: 23% (4737/20592) Updating files: 24% (4943/20592) Updating files: 25% (5148/20592) Updating files: 26% (5354/20592) Updating files: 27% (5560/20592) Updating files: 28% (5766/20592) Updating files: 29% (5972/20592) Updating files: 30% (6178/20592) Updating files: 31% (6384/20592) Updating files: 32% (6590/20592) Updating files: 33% (6796/20592) Updating files: 34% (7002/20592) Updating files: 35% (7208/20592) Updating files: 36% (7414/20592) Updating files: 36% (7461/20592) Updating files: 37% (7620/20592) Updating files: 38% (7825/20592) Updating files: 39% (8031/20592) Updating files: 40% (8237/20592) Updating files: 41% (8443/20592) Updating files: 42% (8649/20592) Updating files: 43% (8855/20592) Updating files: 44% (9061/20592) Updating files: 45% (9267/20592) Updating files: 46% (9473/20592) Updating files: 47% (9679/20592) Updating files: 48% (9885/20592) Updating files: 49% (10091/20592) Updating files: 50% (10296/20592) Updating files: 51% (10502/20592) Updating files: 52% (10708/20592) Updating files: 52% (10863/20592) Updating files: 53% (10914/20592) Updating files: 54% (11120/20592) Updating files: 55% (11326/20592) Updating files: 56% (11532/20592) Updating files: 57% (11738/20592) Updating files: 58% (11944/20592) Updating files: 59% (12150/20592) Updating files: 60% (12356/20592) Updating files: 61% (12562/20592) Updating files: 62% (12768/20592) Updating files: 63% (12973/20592) Updating files: 64% (13179/20592) Updating files: 65% (13385/20592) Updating files: 66% (13591/20592) Updating files: 67% (13797/20592) Updating files: 68% (14003/20592) Updating files: 69% (14209/20592) Updating files: 70% (14415/20592) Updating files: 71% (14621/20592) Updating files: 72% (14827/20592) Updating files: 73% (15033/20592) Updating files: 73% (15099/20592) Updating files: 74% (15239/20592) Updating files: 75% (15444/20592) Updating files: 76% (15650/20592) Updating files: 77% (15856/20592) Updating files: 78% (16062/20592) Updating files: 79% (16268/20592) Updating files: 80% (16474/20592) Updating files: 81% (16680/20592) Updating files: 82% (16886/20592) Updating files: 83% (17092/20592) Updating files: 84% (17298/20592) Updating files: 85% (17504/20592) Updating files: 86% (17710/20592) Updating files: 87% (17916/20592) Updating files: 88% (18121/20592) Updating files: 89% (18327/20592) Updating files: 90% (18533/20592) Updating files: 91% (18739/20592) Updating files: 91% (18944/20592) Updating files: 92% (18945/20592) Updating files: 93% (19151/20592) Updating files: 94% (19357/20592) Updating files: 95% (19563/20592) Updating files: 96% (19769/20592) Updating files: 97% (19975/20592) Updating files: 98% (20181/20592) Updating files: 99% (20387/20592) Updating files: 100% (20592/20592) Updating files: 100% (20592/20592), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/673/head -> PR-673 Switched to branch 'PR-673' HEAD is now at 58702f91 fix(asset-management): allow zero as unlimited max args checked out revision: refs/pull/673/head:PR-673@58702f91424de3a1253d64a7175748664436d558 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-673 #7 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:d6c6f05410dec81e0e12dfa55f7341e0d7b917f2,673:58702f91424de3a1253d64a7175748664436d558:refs/pull/673/head using base branch main and base sha d6c6f05410dec81e0e12dfa55f7341e0d7b917f2 merging sha: 58702f91424de3a1253d64a7175748664436d558 error: error during merge: merging 58702f91424de3a1253d64a7175748664436d558 into main: failed to run 'git merge 58702f91424de3a1253d64a7175748664436d558' command in directory '.', output: 'Auto-merging addons/asset_management/ASSET_MANAGEMENT.md Auto-merging addons/asset_management/models/asset_automation_event.py CONFLICT (content): Merge conflict in addons/asset_management/models/asset_automation_event.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.