[Spce-user] Error upgrade mr11.4.1 to mr12.3.1

[Danny Cappellari]

Hi, sorry, the title is wrong

I attach the complete LOG and the output of "git status" on the ngcp-config

Running scenario: /usr/share/ngcp-upgrade/scenarios/mr12.3.1/upgrade-mr11.5.1-to-mr12.3.1
Sipwise C5 CE detected...
2024-05-23 09:30:13: [1/58] Step 'mr4.2/check_mandatory_variables' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [2/58] Step 'mr5.5/report_check_start' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [3/58] Step 'mr9.5/check_dedicated_fallback' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [4/58] Step 'mr9.0/check_metapackage_type' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [5/58] Step 'mr8.0/check_ngcp_nodename' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [6/58] Step 'mr4.2/check_pending_reboot' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [7/58] Step 'mr4.3/check_monitoring_disabled' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [8/58] Step 'mr11.5/check_debian_version' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [9/58] Step '2.8/check_current_architecture' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [10/58] Step 'mr7.1/check_apt_sources_list' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [11/58] Step 'mr7.4/check_ppas' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [12/58] Step 'mr6.5/check_clean_old_upgrade_backups' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [13/58] Step 'mr4.2/check_ngcpcfg_status' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [14/58] Step 'mr9.5/check_persistent_net_devices' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [15/58] Step 'mr9.5/check_fs_space' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [16/58] Step 'mr9.5/check_db_sync_grants' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [17/58] Step 'mr11.5/check_db_innodb' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [18/58] Step 'mr8.0/check_db_size' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [19/58] Step 'mr8.3/check_ngcpcfg_iface_duped_api_int' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [20/58] Step 'mr6.5/check_ngcpcfg_validate' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [21/58] Step 'mr8.1/check_dangerous_processes' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [22/58] Step 'mr12.0/check_redis_flavor' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [23/58] Step 'mr9.5/report_check_stop' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [24/58] Step 'mr9.5/report_upgrade_start' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [25/58] Step '2.8/backup_ngcp_config' has been executed already, continuing with the next step...
2024-05-23 09:30:13: [26/58] Step 'mr8.3/remove_old_coredumps' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [27/58] Step 'mr9.5/prepare_second_partition' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [28/58] Step '2.8/handle_apt_update' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [29/58] Step 'mr11.5/debootstrap_debian' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [30/58] Step 'mr9.5/disable_man_db_update' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [31/58] Step 'mr9.5/mount_copy_files' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [32/58] Step 'mr9.5/prepare_new_fstab' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [33/58] Step 'mr9.5/get_installer_keyring' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [34/58] Step 'mr9.5/run_installer' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [35/58] Step 'mr11.0/copy_ngcp_config' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [36/58] Step 'mr9.5/copy_ssh_files' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [37/58] Step 'mr9.5/place_customtt_files' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [38/58] Step 'mr9.5/update_cfg_schema' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [39/58] Step 'mr9.5/build_config_files' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [40/58] Step 'mr9.5/copy_jail_files' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [41/58] Step 'mr12.0/backup_redis_db' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [42/58] Step 'mr8.0/backup_mysql_db' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [43/58] Step 'mr11.5/stop' has been executed already, continuing with the next step...
2024-05-23 09:30:14: [44/58] 'spce' Running: /usr/share/ngcp-upgrade/steps/mr9.5/check_current_partition 
Checking if the current partition is mr12.3.1
OK: the current partition is mr12.3.1, continue the upgrade
2024-05-23 09:30:14: [45/58] 'spce' Running: /usr/share/ngcp-upgrade/steps/mr9.5/commit_upgraded_ngcpcfg 
Restoring correct permissions
2024-05-23 09:30:16 spce: OK
2024-05-23 09:30:17: [46/58] 'spce' Running: /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback 
Checking remote 'upgrade_origin'...
No remote 'upgrade_origin' detected, creating...
Getting commits from old partition
>From /ngcp-fallback/etc/ngcp-config
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> upgrade_origin/master
Rebasing (1/1)
Auto-merging .ngcpcfg_perms
Auto-merging templates/etc/default/victoria-metrics.tt2
CONFLICT (content): Merge conflict in templates/etc/default/victoria-metrics.tt2
Auto-merging templates/etc/exim4/update-exim4.conf.conf.tt2
CONFLICT (content): Merge conflict in templates/etc/exim4/update-exim4.conf.conf.tt2
Auto-merging templates/etc/kamailio/lb/kamailio.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/callforward.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/kamailio.cfg.tt2
CONFLICT (content): Merge conflict in templates/etc/kamailio/proxy/kamailio.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/local_applications.cfg.tt2
CONFLICT (content): Merge conflict in templates/etc/kamailio/proxy/local_applications.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/proxy.cfg.tt2
CONFLICT (content): Merge conflict in templates/etc/kamailio/proxy/proxy.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/rtpengine.cfg.tt2
Auto-merging templates/etc/mysql/grants.yml.tt2
CONFLICT (content): Merge conflict in templates/etc/mysql/grants.yml.tt2
Auto-merging templates/etc/ngcp-system-tests/130_filesys-ngcp.yaml.tt2
Auto-merging templates/etc/rtpengine/rtpengine.conf.tt2
Auto-merging templates/etc/systemd/system/victoria-metrics.service.d/override.conf.tt2
error: could not apply 17e2380... Upgrade to mr12.3.1 [2024-05-23 09:30:16.063167359+02:00]
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 17e2380... Upgrade to mr12.3.1 [2024-05-23 09:30:16.063167359+02:00]
ERROR: the step 'mr9.5/merge_commits_from_fallback' failed, upgrade aborted!
Please fix the root of the issue and restart 'ngcp-upgrade'
(see error details in log file /ngcp-data/ngcp-upgrade/mr11.5.1-mr12.3.1/logs/ngcp-upgrade-mr11.5.1-mr12.3.1-1716449406.log ).




GIT STATUS:

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   templates/etc/default/victoria-metrics.tt2
        both modified:   templates/etc/exim4/update-exim4.conf.conf.tt2
        both modified:   templates/etc/kamailio/proxy/kamailio.cfg.tt2
        both modified:   templates/etc/kamailio/proxy/local_applications.cfg.tt2
        both modified:   templates/etc/kamailio/proxy/proxy.cfg.tt2


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sipwise.com/pipermail/spce-user_lists.sipwise.com/attachments/20240523/ec397a48/attachment-0001.htm>