PLAY [all] ********************************************************************* TASK [Gathering Facts] ********************************************************* ok: [localhost] TASK [debug] ******************************************************************* ok: [localhost] => { "msg": "Using 'n1' as instance name" } TASK [Check if git dir already exists] ***************************************** ok: [localhost] TASK [Force get new tags and branches] ***************************************** changed: [localhost] TASK [Clone koha source to /usr/local/src/koha] ******************************** skipping: [localhost] TASK [Copy source koha clone for sandbox] ************************************** changed: [localhost] TASK [Change owner for koha clone for sandbox] ********************************* changed: [localhost] TASK [Create a new database for Koha instance] ********************************* changed: [localhost] TASK [Ensure user doesn't exist or the create below will fail] ***************** changed: [localhost] TASK [mysql_user] ************************************************************** changed: [localhost] TASK [Install koha git config for sandbox] ************************************* changed: [localhost] TASK [Start new koha-testing-docker container] ********************************* changed: [localhost] TASK [Get host port for sandbox staff port] ************************************ changed: [localhost] TASK [debug] ******************************************************************* ok: [localhost] => { "msg": "Using '32791' as staff port" } TASK [Get host port for sandbox opac port] ************************************* changed: [localhost] TASK [debug] ******************************************************************* ok: [localhost] => { "msg": "Using '32790' as opac port" } TASK [Get host port for sandbox ssh port] ************************************** changed: [localhost] TASK [debug] ******************************************************************* ok: [localhost] => { "msg": "Using '32790' as ssh port" } TASK [Install apache config for sandbox instance] ****************************** changed: [localhost] TASK [Symlink the new apache config from sites-available to sites-enabled] ***** changed: [localhost] TASK [Add docker container koha-n1 to ansible hosts] *************************** ok: [localhost] TASK [Test connection to docker container] ************************************* changed: [localhost -> koha-n1] TASK [debug] ******************************************************************* skipping: [localhost] TASK [Pausing for 5 minutes whilst container sets itself up] ******************* Pausing for 300 seconds (ctrl+C then 'C' = continue early, ctrl+C then 'A' = abort) ok: [localhost] TASK [debug] ******************************************************************* ok: [localhost] => { "msg": "GIT_REMOTE is set to " } TASK [Add git remote as n1 in docker container] ******************************* skipping: [localhost] TASK [git checkout commit_id or tag in docker container] ********************** skipping: [localhost] TASK [git checkout n1/ in docker container] ************************************ skipping: [localhost] TASK [Marking repo as a safe git directory] ************************************ changed: [localhost -> koha-n1] TASK [Checkout origin/main in docker container] ******************************** changed: [localhost -> koha-n1] TASK [Apply bug 37596 via git-bz in docker container] ************************** fatal: [localhost -> koha-n1]: FAILED! => {"changed": true, "cmd": "koha-shell -c 'cd /kohadevbox/koha && yes | git bz apply 37596' n1", "delta": "0:00:03.989911", "end": "2025-04-01 09:03:54.721250", "msg": "non-zero return code", "rc": 1, "start": "2025-04-01 09:03:50.731339", "stderr": "error: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nPatch left in /tmp/Bug-37596-update-the-string-Pending-On-Site-Checko-urxsybf6.patch", "stderr_lines": ["error: Failed to merge in the changes.", "hint: Use 'git am --show-current-patch=diff' to see the failed patch", "Patch left in /tmp/Bug-37596-update-the-string-Pending-On-Site-Checko-urxsybf6.patch"], "stdout": "\nBug 37596 - Pending on-site checkouts terminology change needed\n\n176518 - Bug 37596: update the string \"Pending On-Site Checkouts\"\n\nApply? [(y)es, (n)o, (i)nteractive] Applying: Bug 37596: update the string \"Pending On-Site Checkouts\"\nUsing index info to reconstruct a base tree...\nM\tkoha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc\nM\tkoha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt\nM\tkoha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt\nFalling back to patching base and 3-way merge...\nAuto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt\nCONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt\nAuto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt\nCONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt\nAuto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc\nPatch failed at 0001 Bug 37596: update the string \"Pending On-Site Checkouts\"\nWhen you have resolved this problem run \"git bz apply --continue\".\nIf you would prefer to skip this patch, instead run \"git bz apply --skip\".\nTo restore the original branch and stop patching run \"git bz apply --abort\".", "stdout_lines": ["", "Bug 37596 - Pending on-site checkouts terminology change needed", "", "176518 - Bug 37596: update the string \"Pending On-Site Checkouts\"", "", "Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 37596: update the string \"Pending On-Site Checkouts\"", "Using index info to reconstruct a base tree...", "M\tkoha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc", "M\tkoha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt", "M\tkoha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt", "Falling back to patching base and 3-way merge...", "Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt", "CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt", "Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt", "CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt", "Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc", "Patch failed at 0001 Bug 37596: update the string \"Pending On-Site Checkouts\"", "When you have resolved this problem run \"git bz apply --continue\".", "If you would prefer to skip this patch, instead run \"git bz apply --skip\".", "To restore the original branch and stop patching run \"git bz apply --abort\"."]} PLAY RECAP ********************************************************************* localhost : ok=25 changed=16 unreachable=0 failed=1 skipped=5 rescued=0 ignored=0