Started by upstream project "Trigger" build number 190 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-insight-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-insight-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision efbf7e35ce95c195c753051f26f92a075e8b5dd3 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-insight-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-insight.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-insight.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-insight.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f efbf7e35ce95c195c753051f26f92a075e8b5dd3 # timeout=10 Commit message: "Bump version: 5.8.4 → 5.8.5-SNAPSHOT" > git rev-list --no-walk efbf7e35ce95c195c753051f26f92a075e8b5dd3 # timeout=10 Cleaning workspace [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 166 [Pipeline] sh + pushd build ~/workspace/OMERO-insight-push/build ~/workspace/OMERO-insight-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 + popd ~/workspace/OMERO-insight-push + python3 -m venv build/venv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-insight-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-insight-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + python3 -m pip install -U pip Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3) Collecting pip Using cached pip-24.2-py3-none-any.whl (1.8 MB) Installing collected packages: pip Attempting uninstall: pip Found existing installation: pip 21.2.3 Uninstalling pip-21.2.3: Successfully uninstalled pip-21.2.3 Successfully installed pip-24.2 + python3 -m pip install scc Collecting scc Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached PyGithub-2.4.0-py3-none-any.whl.metadata (3.9 kB) Collecting PyYAML>=5.1 (from scc) Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB) Collecting future (from scc) Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB) Collecting ruamel.yaml (from scc) Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB) Collecting ruamel.yaml.jinja2 (from scc) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB) Collecting six (from scc) Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB) Collecting urllib3<2 (from scc) Using cached urllib3-1.26.20-py2.py3-none-any.whl.metadata (50 kB) Collecting yaclifw<0.3,>=0.2.0 (from scc) Using cached yaclifw-0.2.0-py3-none-any.whl Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB) Collecting requests>=2.14.0 (from PyGithub>=1.54->scc) Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.9.0-py3-none-any.whl.metadata (3.0 kB) Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc) Using cached typing_extensions-4.12.2-py3-none-any.whl.metadata (3.0 kB) Collecting Deprecated (from PyGithub>=1.54->scc) Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB) Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB) Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cryptography-43.0.0-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.4 kB) Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached cffi-1.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB) Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB) Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached idna-3.8-py3-none-any.whl.metadata (9.9 kB) Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached certifi-2024.7.4-py3-none-any.whl.metadata (2.2 kB) Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc) Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB) Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes) Using cached scc-0.20.0-py3-none-any.whl (48 kB) Using cached PyGithub-2.4.0-py3-none-any.whl (362 kB) Using cached PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (737 kB) Using cached urllib3-1.26.20-py2.py3-none-any.whl (144 kB) Using cached future-1.0.0-py3-none-any.whl (491 kB) Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB) Using cached six-1.16.0-py2.py3-none-any.whl (11 kB) Using cached PyJWT-2.9.0-py3-none-any.whl (22 kB) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB) Using cached requests-2.32.3-py3-none-any.whl (64 kB) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB) Using cached typing_extensions-4.12.2-py3-none-any.whl (37 kB) Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB) Using cached certifi-2024.7.4-py3-none-any.whl (162 kB) Using cached cffi-1.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (444 kB) Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB) Using cached cryptography-43.0.0-cp39-abi3-manylinux_2_28_x86_64.whl (4.0 MB) Using cached idna-3.8-py3-none-any.whl (66 kB) Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB) Using cached pycparser-2.22-py3-none-any.whl (117 kB) Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc Successfully installed Deprecated-1.2.14 PyGithub-2.4.0 PyYAML-6.0.2 certifi-2024.7.4 cffi-1.17.0 charset-normalizer-3.3.2 cryptography-43.0.0 future-1.0.0 idna-3.8 pycparser-2.22 pyjwt-2.9.0 pynacl-1.5.0 requests-2.32.3 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.16.0 typing-extensions-4.12.2 urllib3-1.26.20 wrapt-1.16.0 yaclifw-0.2.0 [Pipeline] sh + export BASE_REPO=omero-insight.git + BASE_REPO=omero-insight.git + export BASE_BRANCH=master + BASE_BRANCH=master + export VERSION_LOG=/home/omero/workspace/OMERO-insight-push/build/version.tsv + VERSION_LOG=/home/omero/workspace/OMERO-insight-push/build/version.tsv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-insight-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-insight-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + '[' merge_ci '!=' null ']' + export PUSH_BRANCH=merge_ci + PUSH_BRANCH=merge_ci + '[' null '!=' null ']' + export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment' + STATUS=success-only + MERGE_OPTIONS='-vvv --no-ask --reset --comment' + bash build/build-infra-master/recursive-merge Merge base repository (no submodule updates) 2024-08-30 00:56:59,419 [ scc.config] DEBUG Found github.token 2024-08-30 00:56:59,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-08-30 00:56:59,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:56:59,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:00,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-08-30 00:57:00,365 [ scc.gh] DEBUG 4739 remaining from 5000 (Reset at 01:08 2024-08-30 00:57:00,366 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-30 00:57:00,370 [ scc.git] DEBUG Check current status 2024-08-30 00:57:00,370 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-30 00:57:00,375 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT 2024-08-30 00:57:00,375 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-30 00:57:00,421 [ scc.config] DEBUG Found remote.origin.url 2024-08-30 00:57:00,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None 2024-08-30 00:57:01,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-30 00:57:01,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-30 00:57:02,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-30 00:57:02,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-30 00:57:02,557 [ scc.git] DEBUG Resetting... 2024-08-30 00:57:02,557 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-08-30 00:57:02,575 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT 2024-08-30 00:57:02,576 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-08-30 00:57:02,620 [ scc.git] DEBUG Check current status 2024-08-30 00:57:02,621 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-30 00:57:02,625 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT 2024-08-30 00:57:02,626 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-30 00:57:02,665 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-08-30 00:57:02,666 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-08-30 00:57:02,666 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-08-30 00:57:02,666 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-08-30 00:57:02,666 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-08-30 00:57:02,666 [ scc.repo] DEBUG ## PRs found: 2024-08-30 00:57:03,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None 2024-08-30 00:57:03,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444 HTTP/1.1" 200 None 2024-08-30 00:57:04,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444/comments HTTP/1.1" 200 None 2024-08-30 00:57:04,064 [ scc.repo] DEBUG - PR 444 jburel 'fix endpoint' 2024-08-30 00:57:04,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/443 HTTP/1.1" 200 None 2024-08-30 00:57:04,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442 HTTP/1.1" 200 None 2024-08-30 00:57:05,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442/comments HTTP/1.1" 200 None 2024-08-30 00:57:05,372 [ scc.repo] DEBUG - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-08-30 00:57:05,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None 2024-08-30 00:57:06,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None 2024-08-30 00:57:06,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None 2024-08-30 00:57:06,694 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs' 2024-08-30 00:57:07,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None 2024-08-30 00:57:07,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None 2024-08-30 00:57:07,580 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table' 2024-08-30 00:57:08,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None 2024-08-30 00:57:08,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None 2024-08-30 00:57:08,474 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-08-30 00:57:08,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None 2024-08-30 00:57:09,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None 2024-08-30 00:57:09,471 [ scc.repo] DEBUG ## Branches found: 2024-08-30 00:57:09,472 [ scc.git] DEBUG Get sha1 of %s 2024-08-30 00:57:09,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:09,476 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-30 00:57:09,480 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-30 00:57:09,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-30 00:57:09,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-30 00:57:09,491 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:09,492 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head' 2024-08-30 00:57:09,939 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:09,939 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD 2024-08-30 00:57:09,948 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head' 2024-08-30 00:57:10,403 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:10,404 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD 2024-08-30 00:57:10,418 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head' 2024-08-30 00:57:10,739 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:10,739 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD 2024-08-30 00:57:10,744 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head' 2024-08-30 00:57:11,074 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:11,075 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD 2024-08-30 00:57:11,081 [ scc.git] DEBUG Calling 'git fetch origin pull/444/head' 2024-08-30 00:57:11,602 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:11,603 [ scc.git] DEBUG * branch refs/pull/444/head -> FETCH_HEAD 2024-08-30 00:57:11,616 [ scc.git] DEBUG ## Unique users: [] 2024-08-30 00:57:11,616 [ scc.git] DEBUG Get sha1 of %s 2024-08-30 00:57:11,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:11,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-08-30 00:57:11,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:11,667 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-08-30 00:57:11,761 [ scc.git] DEBUG Auto-merging build.gradle 2024-08-30 00:57:11,765 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-30 00:57:11,769 [ scc.git] DEBUG build.gradle | 8 ++++---- 2024-08-30 00:57:11,770 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-) 2024-08-30 00:57:11,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:11,922 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215' 2024-08-30 00:57:11,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:11,942 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 385 (handle case where ROI is not longer in table) 9466472925265b0b02b7c054c55d62705a9b8215' 2024-08-30 00:57:12,189 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-30 00:57:12,194 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++--- 2024-08-30 00:57:12,194 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-) 2024-08-30 00:57:12,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:12,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9' 2024-08-30 00:57:12,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:12,341 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9' 2024-08-30 00:57:12,392 [ scc.git] DEBUG Auto-merging build.gradle 2024-08-30 00:57:12,394 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-30 00:57:12,398 [ scc.git] DEBUG build.gradle | 3 ++- 2024-08-30 00:57:12,398 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-) 2024-08-30 00:57:12,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:12,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-08-30 00:57:12,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:12,748 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 442 (Remove duplicate app_name parameter) 9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-08-30 00:57:13,251 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-30 00:57:13,255 [ scc.git] DEBUG .../java/org/openmicroscopy/shoola/svc/proxy/MessengerRequest.java | 4 +--- 2024-08-30 00:57:13,255 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 3 deletions(-) 2024-08-30 00:57:13,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:13,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-08-30 00:57:13,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:13,478 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 444 (fix endpoint) 2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-08-30 00:57:13,799 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-08-30 00:57:13,804 [ scc.git] DEBUG .../java/org/openmicroscopy/shoola/env/data/DataServicesFactory.java | 2 +- 2024-08-30 00:57:13,804 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-08-30 00:57:13,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:13,936 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-30 00:57:13,984 [ scc.git] DEBUG Get sha1 of %s 2024-08-30 00:57:13,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:13,990 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-30 00:57:14,020 [ scc.git] DEBUG has no local changes 2024-08-30 00:57:14,021 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone Repository: ome/omero-insight Excluded PRs: - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT) - PR 437 dominikl 'Remove apache commons io' (stage: draft) - PR 377 sukunis 'Fix ontology loads' (exclude comment) - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment) Already up to date. Merged PRs: - PR 333 jburel 'drop compatibility to test new Jenkins' - PR 385 jburel 'handle case where ROI is not longer in table' - PR 436 dominikl 'Update apache common libs' - PR 442 dominikl 'Remove duplicate app_name parameter' - PR 444 jburel 'fix endpoint' Generated by OMERO-insight-push#157 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/157/)' 2024-08-30 00:57:14,040 [ scc.git] DEBUG [detached HEAD b315d3f2a] merge master -Dorg -Snone 2024-08-30 00:57:14,040 [ scc.merge] INFO Repository: ome/omero-insight 2024-08-30 00:57:14,041 [ scc.merge] INFO Excluded PRs: 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT) 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft) 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment) 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment) 2024-08-30 00:57:14,041 [ scc.merge] INFO Already up to date. 2024-08-30 00:57:14,041 [ scc.merge] INFO 2024-08-30 00:57:14,041 [ scc.merge] INFO Merged PRs: 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table' 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs' 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-08-30 00:57:14,041 [ scc.merge] INFO - PR 444 jburel 'fix endpoint' 2024-08-30 00:57:14,041 [ scc.merge] INFO 2024-08-30 00:57:14,041 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-08-30 00:57:14,041 [ scc.git] DEBUG Calling 'git remote' Merge all submodules2024-08-30 00:57:14,737 [ scc.config] DEBUG Found github.token 2024-08-30 00:57:14,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-08-30 00:57:14,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:15,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:15,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-08-30 00:57:15,671 [ scc.gh] DEBUG 4679 remaining from 5000 (Reset at 01:08 2024-08-30 00:57:15,676 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-08-30 00:57:15,693 [ scc.git] DEBUG Check current status 2024-08-30 00:57:15,694 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-30 00:57:15,709 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-30 00:57:15,714 [ scc.git] DEBUG b315d3f2a merge master -Dorg -Snone 2024-08-30 00:57:15,781 [ scc.config] DEBUG Found remote.origin.url 2024-08-30 00:57:16,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None 2024-08-30 00:57:16,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-08-30 00:57:16,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-08-30 00:57:17,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-08-30 00:57:17,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-08-30 00:57:17,782 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-30 00:57:17,833 [ scc.git] DEBUG Resetting... 2024-08-30 00:57:17,834 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-08-30 00:57:17,854 [ scc.git] DEBUG HEAD is now at b315d3f2a merge master -Dorg -Snone 2024-08-30 00:57:17,855 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-08-30 00:57:17,913 [ scc.git] DEBUG Check current status 2024-08-30 00:57:17,913 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-08-30 00:57:17,921 [ scc.git] DEBUG b315d3f2a merge master -Dorg -Snone 2024-08-30 00:57:17,922 [ scc.git] DEBUG Calling 'git submodule status' 2024-08-30 00:57:18,019 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-08-30 00:57:18,019 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-08-30 00:57:18,020 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-08-30 00:57:18,020 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-08-30 00:57:18,020 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-08-30 00:57:18,020 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-08-30 00:57:18,020 [ scc.repo] DEBUG ## PRs found: 2024-08-30 00:57:18,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None 2024-08-30 00:57:18,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444 HTTP/1.1" 200 None 2024-08-30 00:57:19,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444/comments HTTP/1.1" 200 None 2024-08-30 00:57:19,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None 2024-08-30 00:57:20,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:20,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-30 00:57:21,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None 2024-08-30 00:57:21,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/2c097b44fcac5cd272b1c0a05a7336d988b5c65b?per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:21,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None 2024-08-30 00:57:22,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/status HTTP/1.1" 200 None 2024-08-30 00:57:22,351 [ scc.repo] DEBUG - PR 444 jburel 'fix endpoint' 2024-08-30 00:57:22,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/443 HTTP/1.1" 200 None 2024-08-30 00:57:23,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442 HTTP/1.1" 200 None 2024-08-30 00:57:23,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442/comments HTTP/1.1" 200 None 2024-08-30 00:57:24,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None 2024-08-30 00:57:24,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:25,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-30 00:57:25,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None 2024-08-30 00:57:26,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9f3d273acb87527eed99aedd868bf0a4ec1b5861?per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:26,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None 2024-08-30 00:57:26,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/status HTTP/1.1" 200 None 2024-08-30 00:57:26,938 [ scc.repo] DEBUG - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-08-30 00:57:27,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None 2024-08-30 00:57:27,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None 2024-08-30 00:57:28,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None 2024-08-30 00:57:28,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None 2024-08-30 00:57:29,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:29,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-30 00:57:30,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None 2024-08-30 00:57:30,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:31,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None 2024-08-30 00:57:31,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None 2024-08-30 00:57:31,507 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs' 2024-08-30 00:57:31,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None 2024-08-30 00:57:32,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None 2024-08-30 00:57:32,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None 2024-08-30 00:57:33,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:33,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-08-30 00:57:34,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None 2024-08-30 00:57:34,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:35,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None 2024-08-30 00:57:35,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None 2024-08-30 00:57:35,558 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table' 2024-08-30 00:57:35,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None 2024-08-30 00:57:36,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None 2024-08-30 00:57:36,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None 2024-08-30 00:57:37,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-08-30 00:57:37,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None 2024-08-30 00:57:38,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2 2024-08-30 00:57:38,297 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-08-30 00:57:38,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None 2024-08-30 00:57:39,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None 2024-08-30 00:57:39,315 [ scc.repo] DEBUG ## Branches found: 2024-08-30 00:57:39,316 [ scc.git] DEBUG Get sha1 of %s 2024-08-30 00:57:39,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:39,322 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-08-30 00:57:39,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-08-30 00:57:39,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-08-30 00:57:39,330 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-08-30 00:57:39,336 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:39,337 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head' 2024-08-30 00:57:39,663 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:39,663 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD 2024-08-30 00:57:39,670 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head' 2024-08-30 00:57:39,966 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:39,966 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD 2024-08-30 00:57:39,972 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head' 2024-08-30 00:57:40,255 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:40,256 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD 2024-08-30 00:57:40,263 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head' 2024-08-30 00:57:40,552 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:40,552 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD 2024-08-30 00:57:40,559 [ scc.git] DEBUG Calling 'git fetch origin pull/444/head' 2024-08-30 00:57:40,841 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-08-30 00:57:40,842 [ scc.git] DEBUG * branch refs/pull/444/head -> FETCH_HEAD 2024-08-30 00:57:40,847 [ scc.git] DEBUG ## Unique users: [] 2024-08-30 00:57:40,848 [ scc.git] DEBUG Get sha1 of %s 2024-08-30 00:57:40,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:40,853 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-08-30 00:57:40,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:40,865 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-08-30 00:57:40,872 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:41,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:41,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215' 2024-08-30 00:57:41,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:41,026 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 385 (handle case where ROI is not longer in table) 9466472925265b0b02b7c054c55d62705a9b8215' 2024-08-30 00:57:41,033 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:41,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:41,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9' 2024-08-30 00:57:41,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:41,420 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9' 2024-08-30 00:57:41,428 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:41,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:41,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-08-30 00:57:41,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:41,821 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 442 (Remove duplicate app_name parameter) 9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-08-30 00:57:41,832 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:42,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:42,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-08-30 00:57:42,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:42,200 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 444 (fix endpoint) 2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-08-30 00:57:42,212 [ scc.git] DEBUG Already up to date. 2024-08-30 00:57:42,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-08-30 00:57:42,567 [ scc.git] DEBUG Calling 'git submodule update' 2024-08-30 00:57:42,648 [ scc.git] DEBUG Get sha1 of %s 2024-08-30 00:57:42,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-08-30 00:57:42,676 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-08-30 00:57:42,754 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-08-30 00:57:42,765 [ scc.git] DEBUG has no local changes 2024-08-30 00:57:42,766 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-insight Excluded PRs: - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT) - PR 437 dominikl 'Remove apache commons io' (stage: draft) - PR 377 sukunis 'Fix ontology loads' (exclude comment) - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment) Already up to date. Merged PRs: - PR 333 jburel 'drop compatibility to test new Jenkins' - PR 385 jburel 'handle case where ROI is not longer in table' - PR 436 dominikl 'Update apache common libs' - PR 442 dominikl 'Remove duplicate app_name parameter' - PR 444 jburel 'fix endpoint' Generated by OMERO-insight-push#157 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/157/)' 2024-08-30 00:57:42,778 [ scc.git] DEBUG [detached HEAD d7f8e36f0] merge master -Dorg -Ssuccess-only 2024-08-30 00:57:42,778 [ scc.merge] INFO Repository: ome/omero-insight 2024-08-30 00:57:42,778 [ scc.merge] INFO Excluded PRs: 2024-08-30 00:57:42,778 [ scc.merge] INFO - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT) 2024-08-30 00:57:42,778 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft) 2024-08-30 00:57:42,778 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment) 2024-08-30 00:57:42,778 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment) 2024-08-30 00:57:42,778 [ scc.merge] INFO Already up to date. 2024-08-30 00:57:42,778 [ scc.merge] INFO 2024-08-30 00:57:42,778 [ scc.merge] INFO Merged PRs: 2024-08-30 00:57:42,778 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-08-30 00:57:42,778 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table' 2024-08-30 00:57:42,779 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs' 2024-08-30 00:57:42,779 [ scc.merge] INFO - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-08-30 00:57:42,779 [ scc.merge] INFO - PR 444 jburel 'fix endpoint' 2024-08-30 00:57:42,779 [ scc.merge] INFO 2024-08-30 00:57:42,779 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-08-30 00:57:42,779 [ scc.git] DEBUG Calling 'git remote' Update component versions Updating omero-gateway from 5.9.1 to 5.9.3-SNAPSHOT Commit all component version changes [detached HEAD e711b7797] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) 2024-08-30 00:57:48,755 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci [Pipeline] archiveArtifacts Archiving artifacts [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline Finished: SUCCESS