![[Jenkins]](/jenkins/static/d0012377/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 195 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Still waiting to schedule task Waiting for next available executor on ‘testintegration’ 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 > 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 Checking out Revision efbf7e35ce95c195c753051f26f92a075e8b5dd3 (refs/remotes/origin/master) > 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 > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-build-push" build number 171 [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 - + popd ~/workspace/OMERO-insight-push + python3 -m venv build/venv > git clean -fdx # timeout=10 + . 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.1-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.8.30-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.8.30-py3-none-any.whl (167 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.1-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.8.30 cffi-1.17.0 charset-normalizer-3.3.2 cryptography-43.0.1 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-09-04 00:56:05,282 [ scc.config] DEBUG Found github.token 2024-09-04 00:56:05,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-09-04 00:56:05,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:05,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:06,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-09-04 00:56:06,201 [ scc.gh] DEBUG 4119 remaining from 5000 (Reset at 01:09 2024-09-04 00:56:06,202 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-04 00:56:06,205 [ scc.git] DEBUG Check current status 2024-09-04 00:56:06,205 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-04 00:56:06,208 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT 2024-09-04 00:56:06,208 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-04 00:56:06,244 [ scc.config] DEBUG Found remote.origin.url 2024-09-04 00:56:06,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None 2024-09-04 00:56:07,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-04 00:56:07,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-04 00:56:07,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-04 00:56:08,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-04 00:56:08,321 [ scc.git] DEBUG Resetting... 2024-09-04 00:56:08,321 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-09-04 00:56:08,335 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT 2024-09-04 00:56:08,336 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-09-04 00:56:08,369 [ scc.git] DEBUG Check current status 2024-09-04 00:56:08,369 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-04 00:56:08,372 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT 2024-09-04 00:56:08,372 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-04 00:56:08,405 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-09-04 00:56:08,405 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-09-04 00:56:08,405 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-09-04 00:56:08,405 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-09-04 00:56:08,405 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-09-04 00:56:08,405 [ scc.repo] DEBUG ## PRs found: 2024-09-04 00:56:08,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None 2024-09-04 00:56:09,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/446 HTTP/1.1" 200 None 2024-09-04 00:56:09,364 [ scc.repo] DEBUG - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release' 2024-09-04 00:56:09,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445 HTTP/1.1" 200 None 2024-09-04 00:56:09,793 [ scc.repo] DEBUG - PR 445 dominikl 'Bump gateway and java version' 2024-09-04 00:56:10,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444 HTTP/1.1" 200 None 2024-09-04 00:56:10,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444/comments HTTP/1.1" 200 None 2024-09-04 00:56:10,716 [ scc.repo] DEBUG - PR 444 jburel 'fix endpoint' 2024-09-04 00:56:11,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/443 HTTP/1.1" 200 None 2024-09-04 00:56:11,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442 HTTP/1.1" 200 None 2024-09-04 00:56:12,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442/comments HTTP/1.1" 200 None 2024-09-04 00:56:12,054 [ scc.repo] DEBUG - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-09-04 00:56:12,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None 2024-09-04 00:56:13,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None 2024-09-04 00:56:13,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None 2024-09-04 00:56:13,492 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs' 2024-09-04 00:56:13,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None 2024-09-04 00:56:14,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None 2024-09-04 00:56:14,367 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table' 2024-09-04 00:56:14,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None 2024-09-04 00:56:15,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None 2024-09-04 00:56:15,280 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-09-04 00:56:15,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None 2024-09-04 00:56:16,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None 2024-09-04 00:56:16,323 [ scc.repo] DEBUG ## Branches found: 2024-09-04 00:56:16,323 [ scc.git] DEBUG Get sha1 of %s 2024-09-04 00:56:16,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:16,327 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-04 00:56:16,330 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-04 00:56:16,330 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-04 00:56:16,333 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-04 00:56:16,337 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:16,337 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head' 2024-09-04 00:56:16,716 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:16,716 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD 2024-09-04 00:56:16,719 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head' 2024-09-04 00:56:17,158 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:17,158 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD 2024-09-04 00:56:17,162 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head' 2024-09-04 00:56:17,507 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:17,507 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD 2024-09-04 00:56:17,510 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head' 2024-09-04 00:56:18,436 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:18,437 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD 2024-09-04 00:56:18,441 [ scc.git] DEBUG Calling 'git fetch origin pull/444/head' 2024-09-04 00:56:18,862 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:18,862 [ scc.git] DEBUG * branch refs/pull/444/head -> FETCH_HEAD 2024-09-04 00:56:18,866 [ scc.git] DEBUG Calling 'git fetch origin pull/445/head' 2024-09-04 00:56:19,286 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:19,286 [ scc.git] DEBUG * branch refs/pull/445/head -> FETCH_HEAD 2024-09-04 00:56:19,288 [ scc.git] DEBUG Calling 'git fetch origin pull/446/head' 2024-09-04 00:56:19,697 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:19,697 [ scc.git] DEBUG * branch refs/pull/446/head -> FETCH_HEAD 2024-09-04 00:56:19,699 [ scc.git] DEBUG ## Unique users: [] 2024-09-04 00:56:19,699 [ scc.git] DEBUG Get sha1 of %s 2024-09-04 00:56:19,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:19,702 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-09-04 00:56:19,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:19,710 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-09-04 00:56:19,843 [ scc.git] DEBUG Auto-merging build.gradle 2024-09-04 00:56:19,845 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-04 00:56:19,847 [ scc.git] DEBUG build.gradle | 8 ++++---- 2024-09-04 00:56:19,847 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-) 2024-09-04 00:56:19,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:19,986 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215' 2024-09-04 00:56:19,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:19,994 [ 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-09-04 00:56:20,396 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-04 00:56:20,398 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++--- 2024-09-04 00:56:20,398 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-) 2024-09-04 00:56:20,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:20,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9' 2024-09-04 00:56:20,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:20,546 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9' 2024-09-04 00:56:20,567 [ scc.git] DEBUG Auto-merging build.gradle 2024-09-04 00:56:20,570 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-04 00:56:20,572 [ scc.git] DEBUG build.gradle | 3 ++- 2024-09-04 00:56:20,572 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-) 2024-09-04 00:56:20,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:20,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-09-04 00:56:20,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:20,936 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 442 (Remove duplicate app_name parameter) 9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-09-04 00:56:21,304 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-04 00:56:21,307 [ scc.git] DEBUG .../java/org/openmicroscopy/shoola/svc/proxy/MessengerRequest.java | 4 +--- 2024-09-04 00:56:21,307 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 3 deletions(-) 2024-09-04 00:56:21,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:21,448 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-09-04 00:56:21,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:21,456 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 444 (fix endpoint) 2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-09-04 00:56:21,510 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-04 00:56:21,513 [ scc.git] DEBUG .../java/org/openmicroscopy/shoola/env/data/DataServicesFactory.java | 2 +- 2024-09-04 00:56:21,513 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-09-04 00:56:21,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:21,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bba6e2511b79882a3a87a28764ba7ea3023701d9' 2024-09-04 00:56:21,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:21,840 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 445 (Bump gateway and java version) bba6e2511b79882a3a87a28764ba7ea3023701d9' 2024-09-04 00:56:21,860 [ scc.git] DEBUG Auto-merging build.gradle 2024-09-04 00:56:21,860 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-09-04 00:56:21,862 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-09-04 00:56:21,863 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-09-04 00:56:21,868 [ scc.git] DEBUG Calling 'git reset --hard 40d9a203d0d7fb51342faaebca3f31efda8dbe4e' 2024-09-04 00:56:21,882 [ scc.git] DEBUG HEAD is now at 40d9a203d merge master -Dorg -Snone: PR 444 (fix endpoint) 2024-09-04 00:56:22,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:22,253 [ scc.git] DEBUG Calling 'git merge-base efbf7e35ce95c195c753051f26f92a075e8b5dd3 bba6e2511b79882a3a87a28764ba7ea3023701d9' 2024-09-04 00:56:22,256 [ scc.git] DEBUG Calling 'git diff --name-only efbf7e35ce95c195c753051f26f92a075e8b5dd3..efbf7e35ce95c195c753051f26f92a075e8b5dd3' 2024-09-04 00:56:22,260 [ scc.git] INFO - PR 445 dominikl 'Bump gateway and java version' Conflicting PR. Removed from build [OMERO-insight-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/162/consoleText) for more details. Possible conflicts: - PR #333 jburel 'drop compatibility to test new Jenkins' - build.gradle - PR #436 dominikl 'Update apache common libs' - build.gradle --conflicts 2024-09-04 00:56:22,262 [ scc.config] DEBUG Found github.token 2024-09-04 00:56:22,263 [ scc.git] DEBUG Adding comment to issue #445. 2024-09-04 00:56:22,966 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-insight/issues/445/comments HTTP/1.1" 201 2064 2024-09-04 00:56:22,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...365c9b2ca329f9b1902551551d96ddd0575854ee' 2024-09-04 00:56:22,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:22,975 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 446 (Add changelog for upcoming 5.8.5 release) 365c9b2ca329f9b1902551551d96ddd0575854ee' 2024-09-04 00:56:22,998 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-09-04 00:56:23,000 [ scc.git] DEBUG CHANGELOG.md | 10 +++++++++- 2024-09-04 00:56:23,000 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 1 deletion(-) 2024-09-04 00:56:23,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:23,363 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-04 00:56:23,398 [ scc.git] DEBUG Get sha1 of %s 2024-09-04 00:56:23,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:23,401 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-04 00:56:23,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14d3e42e50> has no local changes 2024-09-04 00:56:23,486 [ 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' - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release' Conflicting PRs (not included): - PR 445 dominikl 'Bump gateway and java version' Generated by OMERO-insight-push#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/162/)' 2024-09-04 00:56:23,496 [ scc.git] DEBUG [detached HEAD 53b9980c6] merge master -Dorg -Snone 2024-09-04 00:56:23,496 [ scc.merge] INFO Repository: ome/omero-insight 2024-09-04 00:56:23,496 [ scc.merge] INFO Excluded PRs: 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT) 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft) 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment) 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment) 2024-09-04 00:56:23,496 [ scc.merge] INFO Already up to date. 2024-09-04 00:56:23,496 [ scc.merge] INFO 2024-09-04 00:56:23,496 [ scc.merge] INFO Merged PRs: 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table' 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs' 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 444 jburel 'fix endpoint' 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release' 2024-09-04 00:56:23,496 [ scc.merge] INFO 2024-09-04 00:56:23,496 [ scc.merge] INFO Conflicting PRs (not included): 2024-09-04 00:56:23,496 [ scc.merge] INFO - PR 445 dominikl 'Bump gateway and java version' 2024-09-04 00:56:23,496 [ scc.merge] INFO 2024-09-04 00:56:23,496 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-09-04 00:56:23,497 [ scc.git] DEBUG Calling 'git remote' Merge all submodules2024-09-04 00:56:23,920 [ scc.config] DEBUG Found github.token 2024-09-04 00:56:23,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-09-04 00:56:24,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:24,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:24,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-09-04 00:56:24,883 [ scc.gh] DEBUG 4044 remaining from 5000 (Reset at 01:09 2024-09-04 00:56:24,884 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-09-04 00:56:24,887 [ scc.git] DEBUG Check current status 2024-09-04 00:56:24,887 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-04 00:56:24,890 [ scc.git] DEBUG 53b9980c6 merge master -Dorg -Snone 2024-09-04 00:56:24,891 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-04 00:56:24,926 [ scc.config] DEBUG Found remote.origin.url 2024-09-04 00:56:25,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None 2024-09-04 00:56:25,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-09-04 00:56:26,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-09-04 00:56:26,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-09-04 00:56:27,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-09-04 00:56:27,013 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-04 00:56:27,047 [ scc.git] DEBUG Resetting... 2024-09-04 00:56:27,047 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-09-04 00:56:27,061 [ scc.git] DEBUG HEAD is now at 53b9980c6 merge master -Dorg -Snone 2024-09-04 00:56:27,061 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-09-04 00:56:27,094 [ scc.git] DEBUG Check current status 2024-09-04 00:56:27,094 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-09-04 00:56:27,097 [ scc.git] DEBUG 53b9980c6 merge master -Dorg -Snone 2024-09-04 00:56:27,097 [ scc.git] DEBUG Calling 'git submodule status' 2024-09-04 00:56:27,129 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-09-04 00:56:27,129 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-09-04 00:56:27,129 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-09-04 00:56:27,129 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-09-04 00:56:27,130 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-09-04 00:56:27,130 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-09-04 00:56:27,130 [ scc.repo] DEBUG ## PRs found: 2024-09-04 00:56:27,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None 2024-09-04 00:56:28,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/446 HTTP/1.1" 200 None 2024-09-04 00:56:28,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/365c9b2ca329f9b1902551551d96ddd0575854ee HTTP/1.1" 200 None 2024-09-04 00:56:29,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/365c9b2ca329f9b1902551551d96ddd0575854ee/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:29,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/365c9b2ca329f9b1902551551d96ddd0575854ee/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-09-04 00:56:29,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/365c9b2ca329f9b1902551551d96ddd0575854ee HTTP/1.1" 200 None 2024-09-04 00:56:30,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/365c9b2ca329f9b1902551551d96ddd0575854ee?per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:30,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/365c9b2ca329f9b1902551551d96ddd0575854ee HTTP/1.1" 200 None 2024-09-04 00:56:31,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/365c9b2ca329f9b1902551551d96ddd0575854ee/status HTTP/1.1" 200 None 2024-09-04 00:56:31,173 [ scc.repo] DEBUG - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release' 2024-09-04 00:56:31,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445 HTTP/1.1" 200 None 2024-09-04 00:56:32,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445/comments HTTP/1.1" 200 None 2024-09-04 00:56:32,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/bba6e2511b79882a3a87a28764ba7ea3023701d9 HTTP/1.1" 200 None 2024-09-04 00:56:32,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/bba6e2511b79882a3a87a28764ba7ea3023701d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:33,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/bba6e2511b79882a3a87a28764ba7ea3023701d9/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-09-04 00:56:33,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/bba6e2511b79882a3a87a28764ba7ea3023701d9 HTTP/1.1" 200 None 2024-09-04 00:56:34,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/bba6e2511b79882a3a87a28764ba7ea3023701d9?per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:34,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/bba6e2511b79882a3a87a28764ba7ea3023701d9 HTTP/1.1" 200 None 2024-09-04 00:56:35,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/bba6e2511b79882a3a87a28764ba7ea3023701d9/status HTTP/1.1" 200 None 2024-09-04 00:56:35,089 [ scc.repo] DEBUG - PR 445 dominikl 'Bump gateway and java version' 2024-09-04 00:56:35,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444 HTTP/1.1" 200 None 2024-09-04 00:56:35,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444/comments HTTP/1.1" 200 None 2024-09-04 00:56:36,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None 2024-09-04 00:56:36,968 [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-09-04 00:56:37,392 [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-09-04 00:56:37,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None 2024-09-04 00:56:38,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/2c097b44fcac5cd272b1c0a05a7336d988b5c65b?per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:38,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None 2024-09-04 00:56:39,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/status HTTP/1.1" 200 None 2024-09-04 00:56:39,123 [ scc.repo] DEBUG - PR 444 jburel 'fix endpoint' 2024-09-04 00:56:39,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/443 HTTP/1.1" 200 None 2024-09-04 00:56:39,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442 HTTP/1.1" 200 None 2024-09-04 00:56:40,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442/comments HTTP/1.1" 200 None 2024-09-04 00:56:41,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None 2024-09-04 00:56:41,539 [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-09-04 00:56:42,025 [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-09-04 00:56:42,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None 2024-09-04 00:56:42,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9f3d273acb87527eed99aedd868bf0a4ec1b5861?per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:43,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None 2024-09-04 00:56:43,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/status HTTP/1.1" 200 None 2024-09-04 00:56:43,758 [ scc.repo] DEBUG - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-09-04 00:56:44,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None 2024-09-04 00:56:44,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None 2024-09-04 00:56:45,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None 2024-09-04 00:56:45,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None 2024-09-04 00:56:46,080 [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-09-04 00:56:46,509 [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-09-04 00:56:46,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None 2024-09-04 00:56:47,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:47,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None 2024-09-04 00:56:48,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None 2024-09-04 00:56:48,232 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs' 2024-09-04 00:56:48,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None 2024-09-04 00:56:49,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None 2024-09-04 00:56:49,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None 2024-09-04 00:56:50,086 [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-09-04 00:56:50,554 [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-09-04 00:56:50,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None 2024-09-04 00:56:51,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None 2024-09-04 00:56:51,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None 2024-09-04 00:56:52,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None 2024-09-04 00:56:52,237 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table' 2024-09-04 00:56:52,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None 2024-09-04 00:56:53,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None 2024-09-04 00:56:53,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None 2024-09-04 00:56:54,072 [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-09-04 00:56:54,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None 2024-09-04 00:56:54,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2 2024-09-04 00:56:54,933 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-09-04 00:56:55,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None 2024-09-04 00:56:55,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None 2024-09-04 00:56:55,900 [ scc.repo] DEBUG ## Branches found: 2024-09-04 00:56:55,900 [ scc.git] DEBUG Get sha1 of %s 2024-09-04 00:56:55,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:55,904 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-09-04 00:56:55,907 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-09-04 00:56:55,907 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-09-04 00:56:55,911 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-09-04 00:56:55,916 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:55,916 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head' 2024-09-04 00:56:56,264 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:56,264 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD 2024-09-04 00:56:56,267 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head' 2024-09-04 00:56:56,556 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:56,556 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD 2024-09-04 00:56:56,560 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head' 2024-09-04 00:56:56,831 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:56,831 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD 2024-09-04 00:56:56,835 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head' 2024-09-04 00:56:57,112 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:57,112 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD 2024-09-04 00:56:57,115 [ scc.git] DEBUG Calling 'git fetch origin pull/444/head' 2024-09-04 00:56:57,387 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:57,387 [ scc.git] DEBUG * branch refs/pull/444/head -> FETCH_HEAD 2024-09-04 00:56:57,390 [ scc.git] DEBUG Calling 'git fetch origin pull/445/head' 2024-09-04 00:56:57,668 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:57,668 [ scc.git] DEBUG * branch refs/pull/445/head -> FETCH_HEAD 2024-09-04 00:56:57,672 [ scc.git] DEBUG Calling 'git fetch origin pull/446/head' 2024-09-04 00:56:57,953 [ scc.git] DEBUG From https://github.com/ome/omero-insight 2024-09-04 00:56:57,953 [ scc.git] DEBUG * branch refs/pull/446/head -> FETCH_HEAD 2024-09-04 00:56:57,956 [ scc.git] DEBUG ## Unique users: [] 2024-09-04 00:56:57,956 [ scc.git] DEBUG Get sha1 of %s 2024-09-04 00:56:57,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:57,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-09-04 00:56:57,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:57,969 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e' 2024-09-04 00:56:57,974 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:58,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:58,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215' 2024-09-04 00:56:58,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:58,119 [ 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-09-04 00:56:58,125 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:58,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:58,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9' 2024-09-04 00:56:58,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:58,508 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9' 2024-09-04 00:56:58,512 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:58,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:58,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-09-04 00:56:58,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:58,886 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 442 (Remove duplicate app_name parameter) 9f3d273acb87527eed99aedd868bf0a4ec1b5861' 2024-09-04 00:56:58,891 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:59,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:59,309 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-09-04 00:56:59,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:59,317 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 444 (fix endpoint) 2c097b44fcac5cd272b1c0a05a7336d988b5c65b' 2024-09-04 00:56:59,322 [ scc.git] DEBUG Already up to date. 2024-09-04 00:56:59,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:56:59,688 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bba6e2511b79882a3a87a28764ba7ea3023701d9' 2024-09-04 00:56:59,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:56:59,695 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 445 (Bump gateway and java version) bba6e2511b79882a3a87a28764ba7ea3023701d9' 2024-09-04 00:56:59,714 [ scc.git] DEBUG Auto-merging build.gradle 2024-09-04 00:56:59,714 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-09-04 00:56:59,716 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-09-04 00:56:59,716 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-09-04 00:56:59,722 [ scc.git] DEBUG Calling 'git reset --hard 53b9980c6942a18edb64d5499e8292174da3d3ba' 2024-09-04 00:56:59,735 [ scc.git] DEBUG HEAD is now at 53b9980c6 merge master -Dorg -Snone 2024-09-04 00:57:00,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:57:00,088 [ scc.git] DEBUG Calling 'git merge-base 53b9980c6942a18edb64d5499e8292174da3d3ba bba6e2511b79882a3a87a28764ba7ea3023701d9' 2024-09-04 00:57:00,093 [ scc.git] DEBUG Calling 'git diff --name-only efbf7e35ce95c195c753051f26f92a075e8b5dd3..53b9980c6942a18edb64d5499e8292174da3d3ba' 2024-09-04 00:57:00,097 [ scc.git] INFO - PR 445 dominikl 'Bump gateway and java version' Conflicting PR. Removed from build [OMERO-insight-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/162/consoleText) for more details. Possible conflicts: - Upstream changes - build.gradle --conflicts 2024-09-04 00:57:00,100 [ scc.config] DEBUG Found github.token 2024-09-04 00:57:00,100 [ scc.git] DEBUG Adding comment to issue #445. 2024-09-04 00:57:00,753 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-insight/issues/445/comments HTTP/1.1" 201 1955 2024-09-04 00:57:00,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...365c9b2ca329f9b1902551551d96ddd0575854ee' 2024-09-04 00:57:00,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:57:00,762 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 446 (Add changelog for upcoming 5.8.5 release) 365c9b2ca329f9b1902551551d96ddd0575854ee' 2024-09-04 00:57:00,767 [ scc.git] DEBUG Already up to date. 2024-09-04 00:57:01,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-09-04 00:57:01,160 [ scc.git] DEBUG Calling 'git submodule update' 2024-09-04 00:57:01,194 [ scc.git] DEBUG Get sha1 of %s 2024-09-04 00:57:01,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-09-04 00:57:01,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-09-04 00:57:01,230 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-09-04 00:57:01,241 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9b52cee50> has no local changes 2024-09-04 00:57:01,241 [ 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' - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release' Conflicting PRs (not included): - PR 445 dominikl 'Bump gateway and java version' Generated by OMERO-insight-push#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/162/)' 2024-09-04 00:57:01,251 [ scc.git] DEBUG [detached HEAD a12cbd6b5] merge master -Dorg -Ssuccess-only 2024-09-04 00:57:01,251 [ scc.merge] INFO Repository: ome/omero-insight 2024-09-04 00:57:01,251 [ scc.merge] INFO Excluded PRs: 2024-09-04 00:57:01,251 [ scc.merge] INFO - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT) 2024-09-04 00:57:01,251 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft) 2024-09-04 00:57:01,251 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment) 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment) 2024-09-04 00:57:01,252 [ scc.merge] INFO Already up to date. 2024-09-04 00:57:01,252 [ scc.merge] INFO 2024-09-04 00:57:01,252 [ scc.merge] INFO Merged PRs: 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins' 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table' 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs' 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 442 dominikl 'Remove duplicate app_name parameter' 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 444 jburel 'fix endpoint' 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release' 2024-09-04 00:57:01,252 [ scc.merge] INFO 2024-09-04 00:57:01,252 [ scc.merge] INFO Conflicting PRs (not included): 2024-09-04 00:57:01,252 [ scc.merge] INFO - PR 445 dominikl 'Bump gateway and java version' 2024-09-04 00:57:01,252 [ scc.merge] INFO 2024-09-04 00:57:01,252 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-09-04 00:57:01,252 [ scc.git] DEBUG Calling 'git remote' Update component versions Updating omero-gateway from 5.9.1 to 5.9.4-SNAPSHOT Commit all component version changes [detached HEAD 1505714df] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) 2024-09-04 00:57:07,169 [ 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