Showing logs for build greencapitaltrade/bifrost/pr-86 #5 stage from-build-pack and container prepare 2026/03/28 12:19:40 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-86 #5 stage from-build-pack and container place-scripts 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-0-ql9ng 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-1-2tvgt 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-2-6kjpj 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-3-dzxhg 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-4-56lpk 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-6-qd9w7 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-7-s9s4l 2026/03/28 12:19:42 Decoded script /tekton/scripts/script-8-4jkdh Showing logs for build greencapitaltrade/bifrost/pr-86 #5 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-86 #5 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/86/head:PR-86@9f90f825f0fb9e7bc789cbdba4a83c2aeca24e5c to dir: source Cloning into 'source'... Updating files: 23% (4593/19857) Updating files: 24% (4766/19857) Updating files: 25% (4965/19857) Updating files: 26% (5163/19857) Updating files: 27% (5362/19857) Updating files: 28% (5560/19857) Updating files: 29% (5759/19857) Updating files: 30% (5958/19857) Updating files: 31% (6156/19857) Updating files: 32% (6355/19857) Updating files: 33% (6553/19857) Updating files: 34% (6752/19857) Updating files: 35% (6950/19857) Updating files: 36% (7149/19857) Updating files: 37% (7348/19857) Updating files: 38% (7546/19857) Updating files: 39% (7745/19857) Updating files: 40% (7943/19857) Updating files: 41% (8142/19857) Updating files: 42% (8340/19857) Updating files: 43% (8539/19857) Updating files: 44% (8738/19857) Updating files: 45% (8936/19857) Updating files: 46% (9135/19857) Updating files: 46% (9161/19857) Updating files: 47% (9333/19857) Updating files: 48% (9532/19857) Updating files: 49% (9730/19857) Updating files: 50% (9929/19857) Updating files: 51% (10128/19857) Updating files: 52% (10326/19857) Updating files: 53% (10525/19857) Updating files: 54% (10723/19857) Updating files: 55% (10922/19857) Updating files: 56% (11120/19857) Updating files: 57% (11319/19857) Updating files: 58% (11518/19857) Updating files: 59% (11716/19857) Updating files: 60% (11915/19857) Updating files: 61% (12113/19857) Updating files: 62% (12312/19857) Updating files: 63% (12510/19857) Updating files: 64% (12709/19857) Updating files: 65% (12908/19857) Updating files: 66% (13106/19857) Updating files: 67% (13305/19857) Updating files: 68% (13503/19857) Updating files: 69% (13702/19857) Updating files: 70% (13900/19857) Updating files: 71% (14099/19857) Updating files: 72% (14298/19857) Updating files: 73% (14496/19857) Updating files: 74% (14695/19857) Updating files: 74% (14737/19857) Updating files: 75% (14893/19857) Updating files: 76% (15092/19857) Updating files: 77% (15290/19857) Updating files: 78% (15489/19857) Updating files: 79% (15688/19857) Updating files: 80% (15886/19857) Updating files: 81% (16085/19857) Updating files: 82% (16283/19857) Updating files: 83% (16482/19857) Updating files: 84% (16680/19857) Updating files: 85% (16879/19857) Updating files: 86% (17078/19857) Updating files: 87% (17276/19857) Updating files: 88% (17475/19857) Updating files: 89% (17673/19857) Updating files: 90% (17872/19857) Updating files: 91% (18070/19857) Updating files: 92% (18269/19857) Updating files: 93% (18468/19857) Updating files: 94% (18666/19857) Updating files: 95% (18865/19857) Updating files: 96% (19063/19857) Updating files: 97% (19262/19857) Updating files: 98% (19460/19857) Updating files: 99% (19659/19857) Updating files: 100% (19857/19857) Updating files: 100% (19857/19857), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/86/head -> PR-86 Switched to branch 'PR-86' HEAD is now at 9f90f825 chore: upgrade preview PostgreSQL from 14.5 to 17.4 checked out revision: refs/pull/86/head:PR-86@9f90f825f0fb9e7bc789cbdba4a83c2aeca24e5c to dir: source Showing logs for build greencapitaltrade/bifrost/pr-86 #5 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:10b701c09aae1c87458372ebddc775d34a6c83bc,86:9f90f825f0fb9e7bc789cbdba4a83c2aeca24e5c:refs/pull/86/head using base branch main and base sha 10b701c09aae1c87458372ebddc775d34a6c83bc merging sha: 9f90f825f0fb9e7bc789cbdba4a83c2aeca24e5c error: error during merge: merging 9f90f825f0fb9e7bc789cbdba4a83c2aeca24e5c into main: failed to run 'git merge 9f90f825f0fb9e7bc789cbdba4a83c2aeca24e5c' command in directory '.', output: 'Auto-merging .devcontainer/docker-compose.yml Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Auto-merging .lighthouse/jenkins-x/pullrequest.yaml CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml Auto-merging Dockerfile CONFLICT (content): Merge conflict in Dockerfile Auto-merging addons/auth_api_key/__manifest__.py CONFLICT (add/add): Merge conflict in addons/auth_api_key/__manifest__.py Auto-merging addons/auth_api_key/models/__init__.py CONFLICT (add/add): Merge conflict in addons/auth_api_key/models/__init__.py Auto-merging addons/auth_api_key/models/auth_api_key.py CONFLICT (add/add): Merge conflict in addons/auth_api_key/models/auth_api_key.py Auto-merging addons/auth_api_key/models/ir_http.py CONFLICT (add/add): Merge conflict in addons/auth_api_key/models/ir_http.py Auto-merging addons/auth_api_key/views/auth_api_key.xml CONFLICT (add/add): Merge conflict in addons/auth_api_key/views/auth_api_key.xml Auto-merging addons/azure_storage_backend/__manifest__.py CONFLICT (add/add): Merge conflict in addons/azure_storage_backend/__manifest__.py Auto-merging addons/fleet_management/__init__.py CONFLICT (content): Merge conflict in addons/fleet_management/__init__.py Auto-merging addons/fleet_management/__manifest__.py CONFLICT (content): Merge conflict in addons/fleet_management/__manifest__.py Auto-merging addons/fleet_management/models/account_move.py CONFLICT (content): Merge conflict in addons/fleet_management/models/account_move.py Auto-merging addons/fleet_management/models/fleet_company_features.py CONFLICT (content): Merge conflict in addons/fleet_management/models/fleet_company_features.py Auto-merging addons/fleet_management/models/fleet_contract_cache.py CONFLICT (add/add): Merge conflict in addons/fleet_management/models/fleet_contract_cache.py Auto-merging addons/fleet_management/models/fleet_exit.py Auto-merging addons/fleet_management/models/fleet_financial.py Auto-merging addons/fleet_management/models/fleet_incident.py Auto-merging addons/fleet_management/models/fleet_iot_device.py Auto-merging addons/fleet_management/models/fleet_iot_type.py Auto-merging addons/fleet_management/models/fleet_location.py CONFLICT (add/add): Merge conflict in addons/fleet_management/models/fleet_location.py Auto-merging addons/fleet_management/models/fleet_overdue_report.py Auto-merging addons/fleet_management/models/fleet_referral.py Auto-merging addons/fleet_management/models/fleet_subscription.py Auto-merging addons/fleet_management/models/fleet_team_member.py CONFLICT (add/add): Merge conflict in addons/fleet_management/models/fleet_team_member.py Auto-merging addons/fleet_management/models/fleet_vehicle.py Auto-merging addons/fleet_management/models/fleet_vehicle_assignment_training.py Auto-merging addons/fleet_management/models/fleet_vehicle_recovery.py Auto-merging addons/fleet_management/models/hr_fleet_extension.py Auto-merging addons/fleet_management/models/ondc_onboarding.py Auto-merging addons/fleet_management/tests/test_alert_geofence_api.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_alert_geofence_api.py Auto-merging addons/fleet_management/tests/test_api_controllers.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_api_controllers.py Auto-merging addons/fleet_management/tests/test_command_cancel_api.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_command_cancel_api.py Auto-merging addons/fleet_management/tests/test_company_sync.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_company_sync.py Auto-merging addons/fleet_management/tests/test_dashboard_api.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_dashboard_api.py Auto-merging addons/fleet_management/tests/test_document.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_document.py Auto-merging addons/fleet_management/tests/test_feature_cache.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_feature_cache.py Auto-merging addons/fleet_management/tests/test_feature_independence.py CONFLICT (content): Merge conflict in addons/fleet_management/tests/test_feature_independence.py Auto-merging addons/fleet_management/tests/test_financial.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_financial.py Auto-merging addons/fleet_management/tests/test_iot_credentials_and_commands.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_iot_credentials_and_commands.py Auto-merging addons/fleet_management/tests/test_iot_device.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_iot_device.py Auto-merging addons/fleet_management/tests/test_location.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_location.py Auto-merging addons/fleet_management/tests/test_member.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_member.py Auto-merging addons/fleet_management/tests/test_module_registry.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_module_registry.py Auto-merging addons/fleet_management/tests/test_multi_company_api.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_multi_company_api.py Auto-merging addons/fleet_management/tests/test_multi_tenant.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_multi_tenant.py Auto-merging addons/fleet_management/tests/test_report_api.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_report_api.py Auto-merging addons/fleet_management/tests/test_security_access.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_security_access.py Auto-merging addons/fleet_management/tests/test_team_extensions_api.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_team_extensions_api.py Auto-merging addons/fleet_management/tests/test_team_management.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_team_management.py Auto-merging addons/fleet_management/tests/test_telemetry_only_vehicle.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_telemetry_only_vehicle.py Auto-merging addons/fleet_management/tests/test_trip_stop_detection.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_trip_stop_detection.py Auto-merging addons/fleet_management/tests/test_vehicle_management.py CONFLICT (add/add): Merge conflict in addons/fleet_management/tests/test_vehicle_management.py Auto-merging addons/fleet_management/views/fleet_document_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_document_views.xml Auto-merging addons/fleet_management/views/fleet_event_fee_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_event_fee_views.xml Auto-merging addons/fleet_management/views/fleet_iot_command_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_iot_command_views.xml Auto-merging addons/fleet_management/views/fleet_iot_device_views.xml Auto-merging addons/fleet_management/views/fleet_iot_type_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_iot_type_views.xml Auto-merging addons/fleet_management/views/fleet_location_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_location_views.xml Auto-merging addons/fleet_management/views/fleet_member_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_member_views.xml Auto-merging addons/fleet_management/views/fleet_ownership_chain_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_ownership_chain_views.xml Auto-merging addons/fleet_management/views/fleet_subscription_product_selection_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_subscription_product_selection_views.xml Auto-merging addons/fleet_management/views/fleet_subscription_product_selector_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_subscription_product_selector_views.xml Auto-merging addons/fleet_management/views/fleet_vehicle_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/fleet_vehicle_views.xml Auto-merging addons/fleet_management/views/ondc_logistics_views.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/ondc_logistics_views.xml Auto-merging addons/fleet_management/views/ondc_mobility_views.xml Auto-merging addons/fleet_management/views/penalty_rules_enhanced.xml CONFLICT (content): Merge conflict in addons/fleet_management/views/penalty_rules_enhanced.xml Auto-merging addons/fleet_management/wizards/fleet_product_selector_test_wizard_views.xml Auto-merging addons/l10n_in_gst_reports/__manifest__.py CONFLICT (add/add): Merge conflict in addons/l10n_in_gst_reports/__manifest__.py Auto-merging addons/l10n_in_gst_reports/models/__init__.py CONFLICT (add/add): Merge conflict in addons/l10n_in_gst_reports/models/__init__.py Auto-merging addons/l10n_in_gst_reports/security/ir.model.access.csv CONFLICT (add/add): Merge conflict in addons/l10n_in_gst_reports/security/ir.model.access.csv Auto-merging addons/l10n_in_gst_reports/tests/test_gstr1_report.py CONFLICT (add/add): Merge conflict in addons/l10n_in_gst_reports/tests/test_gstr1_report.py Auto-merging addons/l10n_in_gst_reports/tests/test_gstr3b_report.py CONFLICT (add/add): Merge conflict in addons/l10n_in_gst_reports/tests/test_gstr3b_report.py Auto-merging addons/l10n_in_gst_reports/wizards/__init__.py CONFLICT (add/add): Merge conflict in addons/l10n_in_gst_reports/wizards/__init__.py Auto-merging odoo.conf Auto-merging preview/postgresql/values.yaml CONFLICT (content): Merge conflict in preview/postgresql/values.yaml 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.