Showing logs for build greencapitaltrade/bifrost/pr-556 #2 stage from-build-pack and container prepare 2026/09/26 10:32:59 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-556 #2 stage from-build-pack and container place-scripts 2026/09/26 10:33:03 Decoded script /tekton/scripts/script-0-csrwj 2026/09/26 10:33:03 Decoded script /tekton/scripts/script-1-7sxm6 2026/09/26 10:33:03 Decoded script /tekton/scripts/script-2-7glhn 2026/09/26 10:33:03 Decoded script /tekton/scripts/script-3-vgfd8 2026/09/26 10:33:03 Decoded script /tekton/scripts/script-4-dstng 2026/09/26 10:33:03 Decoded script /tekton/scripts/script-6-w92pn 2026/09/26 10:33:04 Decoded script /tekton/scripts/script-7-t7jb8 2026/09/26 10:33:04 Decoded script /tekton/scripts/script-8-x76k6 Showing logs for build greencapitaltrade/bifrost/pr-556 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-556 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/556/head:PR-556@276d8746e89600d0f57630cfcf2e67c4d73935d0 to dir: source Cloning into 'source'... Updating files: 18% (3803/20565) Updating files: 19% (3908/20565) Updating files: 20% (4113/20565) Updating files: 21% (4319/20565) Updating files: 22% (4525/20565) Updating files: 23% (4730/20565) Updating files: 24% (4936/20565) Updating files: 25% (5142/20565) Updating files: 26% (5347/20565) Updating files: 27% (5553/20565) Updating files: 28% (5759/20565) Updating files: 29% (5964/20565) Updating files: 30% (6170/20565) Updating files: 31% (6376/20565) Updating files: 32% (6581/20565) Updating files: 33% (6787/20565) Updating files: 34% (6993/20565) Updating files: 35% (7198/20565) Updating files: 36% (7404/20565) Updating files: 37% (7610/20565) Updating files: 37% (7713/20565) Updating files: 38% (7815/20565) Updating files: 39% (8021/20565) Updating files: 40% (8226/20565) Updating files: 41% (8432/20565) Updating files: 42% (8638/20565) Updating files: 43% (8843/20565) Updating files: 44% (9049/20565) Updating files: 45% (9255/20565) Updating files: 46% (9460/20565) Updating files: 47% (9666/20565) Updating files: 48% (9872/20565) Updating files: 49% (10077/20565) Updating files: 50% (10283/20565) Updating files: 51% (10489/20565) Updating files: 52% (10694/20565) Updating files: 53% (10900/20565) Updating files: 54% (11106/20565) Updating files: 55% (11311/20565) Updating files: 56% (11517/20565) Updating files: 57% (11723/20565) Updating files: 57% (11774/20565) Updating files: 58% (11928/20565) Updating files: 59% (12134/20565) Updating files: 60% (12339/20565) Updating files: 61% (12545/20565) Updating files: 62% (12751/20565) Updating files: 63% (12956/20565) Updating files: 64% (13162/20565) Updating files: 65% (13368/20565) Updating files: 66% (13573/20565) Updating files: 67% (13779/20565) Updating files: 68% (13985/20565) Updating files: 69% (14190/20565) Updating files: 70% (14396/20565) Updating files: 71% (14602/20565) Updating files: 72% (14807/20565) Updating files: 73% (15013/20565) Updating files: 74% (15219/20565) Updating files: 75% (15424/20565) Updating files: 76% (15630/20565) Updating files: 76% (15695/20565) Updating files: 77% (15836/20565) Updating files: 78% (16041/20565) Updating files: 79% (16247/20565) Updating files: 80% (16452/20565) Updating files: 81% (16658/20565) Updating files: 82% (16864/20565) Updating files: 83% (17069/20565) Updating files: 84% (17275/20565) Updating files: 85% (17481/20565) Updating files: 86% (17686/20565) Updating files: 87% (17892/20565) Updating files: 88% (18098/20565) Updating files: 89% (18303/20565) Updating files: 90% (18509/20565) Updating files: 91% (18715/20565) Updating files: 92% (18920/20565) Updating files: 93% (19126/20565) Updating files: 94% (19332/20565) Updating files: 95% (19537/20565) Updating files: 96% (19743/20565) Updating files: 97% (19949/20565) Updating files: 97% (20061/20565) Updating files: 98% (20154/20565) Updating files: 99% (20360/20565) Updating files: 100% (20565/20565) Updating files: 100% (20565/20565), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/556/head -> PR-556 Switched to branch 'PR-556' HEAD is now at 276d8746 docs(iot): require legacy ACK backlog drain before rollout checked out revision: refs/pull/556/head:PR-556@276d8746e89600d0f57630cfcf2e67c4d73935d0 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-556 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:4efb295c29093c5eb5fd92787db190521274312d,556:276d8746e89600d0f57630cfcf2e67c4d73935d0:refs/pull/556/head using base branch main and base sha 4efb295c29093c5eb5fd92787db190521274312d merging sha: 276d8746e89600d0f57630cfcf2e67c4d73935d0 error: error during merge: merging 276d8746e89600d0f57630cfcf2e67c4d73935d0 into main: failed to run 'git merge 276d8746e89600d0f57630cfcf2e67c4d73935d0' command in directory '.', output: 'Auto-merging addons/asset_management/ASSET_MANAGEMENT.md Auto-merging addons/asset_management/tests/__init__.py Auto-merging addons/asset_management/tests/test_member_team_hierarchy.py CONFLICT (content): Merge conflict in addons/asset_management/tests/test_member_team_hierarchy.py Auto-merging addons/asset_management/tests/test_team_dues_rollup.py CONFLICT (content): Merge conflict in addons/asset_management/tests/test_team_dues_rollup.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.