[Spce-user] [EXTERNAL] ISSUE: mr14.1.1-mr26.0.1 Upgrade Failure
SPCE Newbie
spce-user at tel.co.uk
Mon Jun 29 03:10:29 EDT 2026
Hi
Thanks
------ Original Message -----
Date: Mon, 29 Jun 2026 09:07:36 +0200
From: Jose Antonio Su Ng <jsung at sipwise.com>
To: SPCE Newbie <spce-user at tel.co.uk>
Cc: Spce-user <spce-user at lists.sipwise.com>
Subject: Re: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade Failure
Hi,
Yes, you can continue with the upgrade. Just make sure that the change
in */usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback*
that I mentioned before is in place. Otherwise the upgrade will keep
failing.
Best regards,
Jose Su
On 6/26/26 19:56, SPCE Newbie wrote:
> Hi,
>
> Thank you for your support.
>
> Glad I checked.
>
> Should I continue with the upgrade or is the one error at the end a
> show-stoppper?
>
> [sipwise-prod-mr26.0.1] root at spce:~# cd /etc/ngcp-config
> [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master *+%|REBASE
> 1/1)# git checkout --theirs
> templates/etc/kamailio/proxy/dialog.cfg.tt2 Updated 1 path from the
> index [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master
> *+%|REBASE 1/1)# git checkout --theirs
> templates/etc/kamailio/proxy/proxy.cfg.tt2 Updated 1 path from the
> index [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master
> *+%|REBASE 1/1)# git add templates/etc/kamailio/proxy/dialog.cfg.tt2
> [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master *+%|REBASE
> 1/1)# git add templates/etc/kamailio/proxy/proxy.cfg.tt2
> [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master +%|REBASE
> 1/1)# GIT_EDITOR=true git rebase --continue Recorded resolution for
> 'templates/etc/kamailio/proxy/dialog.cfg.tt2'. Recorded resolution
> for 'templates/etc/kamailio/proxy/proxy.cfg.tt2'. [detached HEAD
> 7c08308] Upgrade to mr26.0.1 125 files changed, 4468 insertions(+),
> 1473 deletions(-) create mode 100644 templates/etc/cron.allow.tt2
> create mode 100755
> templates/etc/freeswitch/autoload_configs/ngcpcfg.services create
> mode 100755 templates/etc/freeswitch/dialplan/logic/ngcpcfg.services
> create mode 100755 templates/etc/freeswitch/dialplan/ngcpcfg.services
> create mode 100755
> templates/etc/freeswitch/directory/default/ngcpcfg.services create
> mode 100755 templates/etc/freeswitch/lang/en/ivr/ngcpcfg.services
> create mode 100755 templates/etc/freeswitch/lang/ngcpcfg.services
> create mode 100755 templates/etc/freeswitch/lang/vm/ngcpcfg.services
> create mode 100755 templates/etc/freeswitch/ngcpcfg.services create
> mode 100755 templates/etc/freeswitch/sip_profiles/ngcpcfg.services
> create mode 100755 templates/etc/freeswitch/yaml/ngcpcfg.services
> rename
> templates/etc/grafana/dashboards/prometheus/{keydb-statistics.json.tt2
> => db-keyvalue-statistics.json.tt2} (99%) rename
> templates/etc/grafana/dashboards/prometheus/{database-statistics.json.tt2
> => db-sql-statistics.json.tt2} (99%) create mode 100644
> templates/etc/kamailio/proxy/lnp_local_qor.cfg.tt2 delete mode 100644
> templates/etc/systemd/system/systemd-timesyncd.service.d/zz-allow-time-daemons.conf.tt2
> delete mode 100755 templates/etc/systemd/timesyncd.conf.services
> delete mode 100644 templates/etc/systemd/timesyncd.conf.tt2 create
> mode 100644 templates/etc/valkey/valkey-central.conf.postbuild create
> mode 100755 templates/etc/valkey/valkey-central.conf.services create
> mode 100644 templates/etc/valkey/valkey-central.conf.tt2 Successfully
> rebased and updated refs/heads/master. [sipwise-prod-mr26.0.1]
> root at spce:/etc/ngcp-config (master %)#
> /usr/share/ngcp-ngcpcfg/helper/restore-permissions /etc/ngcp-config/
> [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master %)# git
> remote remove upgrade_origin error: No such remote: 'upgrade_origin'
> [sipwise-prod-mr26.0.1] root at spce:/etc/ngcp-config (master %)# 2 #
>
> Thank you.
>
> SPCE Newbie
>
>
> ----- Original Message -----
> Date: Fri, 26 Jun 2026 12:45:20 +0200
> From: Jose Antonio Su Ng<jsung at sipwise.com>
> To: SPCE Newbie<spce-user at tel.co.uk>
> Cc: Spce-user<spce-user at lists.sipwise.com>
> Subject: Re: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade
> Failure
>
> Hi,
>
> Exit the chroot /ngcp-fallback/. You need to be in the root partition,
> so exit until you are in the root partition.
>
> Let me send again the commands, looks like my copy paste was not
> properly done.
>
> cd /etc/ngcp-config
> git checkout --theirs templates/etc/kamailio/proxy/dialog.cfg.tt2
> git checkout --theirs templates/etc/kamailio/proxy/proxy.cfg.tt2
> git add templates/etc/kamailio/proxy/dialog.cfg.tt2
> git add templates/etc/kamailio/proxy/proxy.cfg.tt2
> GIT_EDITOR=true git rebase --continue
> /usr/share/ngcp-ngcpcfg/helper/restore-permissions /etc/ngcp-config/
> git remote remove upgrade_origin
>
> then you can continue with the upgrade in the root partition (not the
> fallback).
>
> Best regards,
>
> On 6/26/26 11:29, SPCE Newbie wrote:
>> Hi,
>>
>> Thanks for your support.
>>
>> # cd /etc/ngcp-config
>>
>> /etc/ngcp-config# gitcheckout --theirs
>> templates/etc/kamailio/proxy/dialog.cfg.tt2 bash: gitcheckout:
>> command not found
>>
>> /etc/ngcp-config# git checkout --theirs
>> templates/etc/kamailio/proxy/dialog.cfg.tt2 Updated 1 path from the
>> index
>>
>> /etc/ngcp-config# git checkout --theirs
>> templates/etc/kamailio/proxy/proxy.cfg.tt2 Updated 1 path from the
>> index
>>
>> /etc/ngcp-config# git add templates
>> /etc/kamailio/proxy/dialog.cfg.tt2 fatal:
>> /etc/kamailio/proxy/dialog.cfg.tt2:
>> '/etc/kamailio/proxy/dialog.cfg.tt2' is outside repository at
>> '/etc/ngcp-config'
>>
>> /etc/ngcp-config# git add templates /etc/kamailio/proxy/proxy.cfg.tt2
>> fatal: /etc/kamailio/proxy/proxy.cfg.tt2:
>> '/etc/kamailio/proxy/proxy.cfg.tt2' is outside repository at
>> '/etc/ngcp-config'
>>
>> /etc/ngcp-config# GIT_EDITOR=true git rebase --continue
>> templates/etc/kamailio/proxy/dialog.cfg.tt2: needs merge
>> templates/etc/kamailio/proxy/proxy.cfg.tt2: needs merge
>> You must edit all merge conflicts and then
>> mark them as resolved using git add
>>
>> /etc/ngcp-config# /usr/share/ngcp-ngcpcfg/helper/restore-permissions
>> /etc/ngcp-config
>>
>> /etc/ngcp-config# git remote remove upgrade_origin
>>
>>
>> /etc/ngcp-config# ls -l
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>> -rwxr-xr-x 1 root root 661 Jun 26 11:12
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>>
>> /etc/ngcp-config# cp -p
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback .
>>
>> /etc/ngcp-config# vi
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>>
>> # diff -u
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>> merge_commits_from_fallback ---
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>> 2026-06-26 11:12:04.407914401 +0200 +++ merge_commits_from_fallback
>> 2026-04-24 14:59:53.000000000 +0200 @@ -2,8 +2,6 @@ set -eEuo
>> pipefail
>> -exit 0
>> -
>> remote_name='upgrade_origin'
>>
>> cd /etc/ngcp-config
>>
>>
>>> After that please continue with the upgrade.
>> I encountered a few errors (above); continue any way?
>>
>> Continue from the instructions in the manual after
>> # ngcp-upgrade --target mr26.0.1 ?
>>
>> There was a
>> # chroot /ngcp-fallback/
>> earlier. Despite that, continue from the manual?
>>
>> Thank you.
>>
>> SPCE Newbie
>>
>> ----- Original Message -----
>> Date: Fri, 26 Jun 2026 10:43:06 +0200
>> From: Jose Antonio Su Ng<jsung at sipwise.com>
>> To: SPCE Newbie<spce-user at tel.co.uk>
>> Cc: Spce-user<spce-user at lists.sipwise.com>
>> Subject: Re: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade
>> Failure
>>
>>
>> Hi,
>>
>> Sorry, I meant for those 2 specific files. So that conflict on those
>> 2 files is only those lines.
>>
>> In any case, please do as follow:
>>
>> cd /etc/ngcp-config
>> gitcheckout --theirs templates/etc/kamailio/proxy/dialog.cfg.tt2
>> gitcheckout --theirs templates/etc/kamailio/proxy/proxy.cfg.tt2
>> gitaddtemplates/etc/kamailio/proxy/dialog.cfg.tt2
>> gitaddtemplates/etc/kamailio/proxy/proxy.cfg.tt2
>> GIT_EDITOR=true gitrebase --continue
>> /usr/share/ngcp-ngcpcfg/helper/restore-permissions /etc/ngcp-config/
>> gitremote remove upgrade_origin
>>
>> And then edit
>> "/usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback" and
>> insert "exit 0" at the beginning of the script like:
>>
>> diff -u
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>> merge_commits_from_fallback ---
>> /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
>> 2026-06-25 10:30:28.000000000 +0200 +++ merge_commits_from_fallback
>> 2026-06-26 10:38:09.443966814 +0200 @@ -2,6 +2,8 @@
>>
>> set -eEuo pipefail
>>
>> +exit 0
>> +
>> remote_name='upgrade_origin'
>>
>> cd /etc/ngcp-config
>>
>> After that please continue with the upgrade.
>>
>> Best regards,
>> Jose Su
>>
>> On 6/26/26 09:46, SPCE Newbie wrote:
>>> Hi,
>>>
>>> Not that I'm aware of but happy to provide more diffs.
>>>
>>> SPCE Newbie
>>>
>>> ------ Original Message -----
>>> Date: Fri, 26 Jun 2026 09:09:07 +0200
>>> From: Jose Antonio Su Ng<jsung at sipwise.com>
>>> To: SPCE Newbie<spce-user at tel.co.uk>
>>> Cc: Spce-user<spce-user at lists.sipwise.com>
>>> Subject: Re: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade
>>> Failure
>>>
>>>
>>> Hi,
>>>
>>> Is the merge conflict for only those few lines per file? Or it is
>>> more?
>>>
>>> Best regards,
>>> Jose Su
>>>
>>> On 6/25/26 16:17, SPCE Newbie wrote:
>>>> Good afternoon Jose,
>>>>
>>>> Not production. Minimally configured. Can reinstall from the
>>>> mr26.1.0 ISO.
>>>>
>>>> ----- Original Message -------
>>>> Date: Thu, 25 Jun 2026 13:44:14 +0100
>>>> From: SPCE Newbie<spce-user at tel.co.uk>
>>>> To: Spce-user<spce-user at lists.sipwise.com>
>>>> Subject: RE: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1
>>>> Upgrade Failure
>>>>
>>>>
>>>> Good afternoon Jose,
>>>>
>>>> Not that I am aware of.
>>>>
>>>> * 1e72820 (3 hours ago) Upgrade to mr26.0.1 [2026-06-25 11:37:56
>>>> +0200] (master)
>>>> * 128a86f (3 months ago) committing uncommented changes [2026-03-27
>>>> 16:26:20 +0100]
>>>> * 420f82b (3 months ago) committing uncommented changes [2026-03-18
>>>> 11:49:20 +0100]
>>>>
>>>>
>>>> # apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
>>>> ngcp-upgrade-ce:
>>>> Installed: 26.0.1.3+0~mr26.0.1.3
>>>> Candidate: 26.0.1.3+0~mr26.0.1.3
>>>> Version table:
>>>> *** 26.0.1.3+0~mr26.0.1.3 990
>>>> 990https://deb.sipwise.com/spce/mr26.0.1 trixie/main
>>>> amd64 Packages 100 /var/lib/dpkg/status
>>>> ngcp-templates-ce:
>>>> Installed: 26.0.1.26+0~mr26.0.1.26
>>>> Candidate: 26.0.1.26+0~mr26.0.1.26
>>>> Version table:
>>>> *** 26.0.1.26+0~mr26.0.1.26 990
>>>> 990https://deb.sipwise.com/spce/mr26.0.1 trixie/main
>>>> amd64 Packages 100 /var/lib/dpkg/status
>>>>
>>>>
>>>> # cd /etc/ngcp-config
>>>> [sipwise-prod-mr26.0.1] root at hostname:/etc/ngcp-config (master
>>>> *+|REBASE 1/1)# git diff
>>>> templates/etc/kamailio/proxy/dialog.cfg.tt2 diff --cc
>>>> templates/etc/kamailio/proxy/dialog.cfg.tt2 index
>>>> 6c8fe18,aa4e0b8..0000000 ---
>>>> a/templates/etc/kamailio/proxy/dialog.cfg.tt2 +++
>>>> b/templates/etc/kamailio/proxy/dialog.cfg.tt2 @@@ -1203,6 -1203,10
>>>> +1203,13 @@@ event_route[dialog:end { xlog("$var(log_info)",
>>>> "[dialog:end] lua_dlg_callid:[«$dlg_var(lua_dlg_callid)»] - [%
>>>> logreq %]\n"); ++<<<<<<< HEAD
>>>> ++=======
>>>> + [%- IF ENABLE_MULTIPRX %]
>>>> + route(ROUTE_CLEAN_ALL_MULTIPROXY_KEYS);
>>>> + [%- END %]
>>>> +
>>>> ++>>>>>>> 1e72820 (Upgrade to mr26.0.1)
>>>> if ($dlg_var(unpark_request) == "1")
>>>> {
>>>> xlog("$var(log_notice)", "[dialog:end] this is
>>>> unparking leg, allow further processing in dialog:end - [% logreq
>>>> %]\n");
>>>>
>>>>
>>>>
>>>> # git diff templates/etc/kamailio/proxy/proxy.cfg.tt2
>>>> diff --cc templates/etc/kamailio/proxy/proxy.cfg.tt2
>>>> index 09037e1,ca71fcb..0000000
>>>> --- a/templates/etc/kamailio/proxy/proxy.cfg.tt2
>>>> +++ b/templates/etc/kamailio/proxy/proxy.cfg.tt2
>>>> @@@ -1270,6 -1298,8 +1298,11 @@@ route[ROUTE_INITVARS
>>>> $var(out_colp_display) = 0;
>>>> $var(out_colp_name) = 0;
>>>>
>>>> ++<<<<<<< HEAD
>>>> ++=======
>>>> + $var(rtpengine_likely_b_leg) = 0;
>>>> +
>>>> ++>>>>>>> 1e72820 (Upgrade to mr26.0.1)
>>>> if(!has_totag() && !t_is_failure_route())
>>>> {
>>>> # set defaults for calls to or from voicebox,
>>>> faxserver etc which have no prefs
>>>>
>>>>
>>>>
>>>> # chroot /ngcp-fallback/
>>>> root at hostname:/# apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
>>>> ngcp-upgrade-ce:
>>>> Installed: 26.0.1.3+0~mr26.0.1.3
>>>> Candidate: 26.0.1.3+0~mr26.0.1.3
>>>> Version table:
>>>> *** 26.0.1.3+0~mr26.0.1.3 100
>>>> 100 /var/lib/dpkg/status
>>>> 14.1.1.6+0~mr14.1.1.6 990
>>>> 990https://deb.sipwise.com/spce/mr14.1.1 trixie/main
>>>> amd64 Packages ngcp-templates-ce:
>>>> Installed: 14.1.1.23+0~mr14.1.1.23
>>>> Candidate: 14.1.1.23+0~mr14.1.1.23
>>>> Version table:
>>>> *** 14.1.1.23+0~mr14.1.1.23 990
>>>> 990https://deb.sipwise.com/spce/mr14.1.1 trixie/main
>>>> amd64 Packages 100 /var/lib/dpkg/status
>>>>
>>>> TIA
>>>>
>>>> SPCE Newbie
>>>>
>>>> ----- Original Message -----
>>>> Date: Thu, 25 Jun 2026 14:04:04 +0200
>>>> From: Jose Antonio Su Ng<jsung at sipwise.com>
>>>> To: SPCE Newbie<spce-user at tel.co.uk>,
>>>> Spce-user<spce-user at lists.sipwise.com> Subject: Re: [EXTERNAL]
>>>> [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade Failure
>>>>
>>>>
>>>> Hi,
>>>>
>>>> Did you made any changes on those 2 files where there is a merge
>>>> conflict?
>>>>
>>>> Could you provide the following outputs:
>>>>
>>>> - ngcpcfg log -n 3
>>>> - apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
>>>> - cd /etc/ngcp-config
>>>> - git diff templates/etc/kamailio/proxy/dialog.cfg.tt2
>>>> - git diff templates/etc/kamailio/proxy/proxy.cfg.tt2
>>>> - chroot /ngcp-fallback/
>>>> - apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
>>>>
>>>> Best regards,
>>>> Jose Su
>>>>
>>>> On 6/25/26 11:53, SPCE Newbie wrote:
>>>>> Hi,
>>>>>
>>>>> mr14.1.1 was at "green" status -- both systemctl status and
>>>>> ngcp-status
>>>>>
>>>>> Second stage upgrade failed:
>>>>>
>>>>> OK: the current partition is mr26.0.1, continue the upgrade
>>>>> 2026-06-25 11:37:55: [49/63] 'spce' Running:
>>>>> /usr/share/ngcp-upgrade/steps/mr9.5/commit_upgraded_ngcpcfg
>>>>> Restoring correct permissions 2026-06-25 11:37:56 spce: OK
>>>>> 2026-06-25 11:37:58: [50/63] '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
>>>>> Auto-merging templates/etc/kamailio/proxy/callforward.cfg.tt2
>>>>> Auto-merging templates/etc/kamailio/proxy/dialog.cfg.tt2
>>>>> CONFLICT (content): Merge conflict in
>>>>> templates/etc/kamailio/proxy/dialog.cfg.tt2 Auto-merging
>>>>> templates/etc/kamailio/proxy/kamailio.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 error:
>>>>> could not apply 1e72820... Upgrade to mr26.0.1 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". hint: Disable this message with "git config
>>>>> advice.mergeConflict false" Recorded preimage for
>>>>> 'templates/etc/kamailio/proxy/dialog.cfg.tt2' Recorded preimage
>>>>> for 'templates/etc/kamailio/proxy/proxy.cfg.tt2' Could not apply
>>>>> 1e72820... Upgrade to mr26.0.1 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/mr14.1.1-mr26.0.1/logs/ngcp-upgrade-mr14.1.1-mr26.0.1-1782380247.log
>>>>> ).
>>>>>
>>>>> The log file is attached.
More information about the Spce-user
mailing list