Console Output
+ 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-04-18 00:55:26,030 [ scc.config] DEBUG Found github.token
2024-04-18 00:55:26,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-18 00:55:26,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:26,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:27,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-18 00:55:27,124 [ scc.gh] DEBUG 2716 remaining from 5000 (Reset at 01:04
2024-04-18 00:55:27,125 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:55:27,129 [ scc.git] DEBUG Check current status
2024-04-18 00:55:27,129 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:55:27,133 [ scc.git] DEBUG 558b56cf6 Merge pull request #422 from jburel/issue_421
2024-04-18 00:55:27,134 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:55:27,181 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:55:27,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-04-18 00:55:28,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:55:28,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:55:28,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:55:29,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:55:29,326 [ scc.git] DEBUG Resetting...
2024-04-18 00:55:29,326 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-18 00:55:29,345 [ scc.git] DEBUG HEAD is now at 558b56cf6 Merge pull request #422 from jburel/issue_421
2024-04-18 00:55:29,345 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-18 00:55:29,396 [ scc.git] DEBUG Check current status
2024-04-18 00:55:29,396 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:55:29,401 [ scc.git] DEBUG 558b56cf6 Merge pull request #422 from jburel/issue_421
2024-04-18 00:55:29,401 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:55:29,444 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-18 00:55:29,444 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-18 00:55:29,444 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-18 00:55:29,444 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-18 00:55:29,444 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-18 00:55:29,445 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:55:29,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-04-18 00:55:30,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-04-18 00:55:30,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-04-18 00:55:31,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-04-18 00:55:31,449 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-04-18 00:55:31,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/427 HTTP/1.1" 200 None
2024-04-18 00:55:31,911 [ scc.repo] DEBUG - PR 427 dominikl 'Handle out of space'
2024-04-18 00:55:32,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416 HTTP/1.1" 200 None
2024-04-18 00:55:32,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416/comments HTTP/1.1" 200 None
2024-04-18 00:55:32,892 [ scc.repo] DEBUG - PR 416 jburel 'Prep 5.8.4'
2024-04-18 00:55:33,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-04-18 00:55:33,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-04-18 00:55:33,844 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-04-18 00:55:34,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-04-18 00:55:34,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-04-18 00:55:34,772 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-04-18 00:55:35,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-04-18 00:55:35,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-04-18 00:55:35,979 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:55:35,980 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:55:35,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:35,984 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:55:35,988 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:55:35,989 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:55:35,993 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:55:35,997 [ scc.git] DEBUG Already up to date.
2024-04-18 00:55:35,997 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-04-18 00:55:36,452 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:55:36,453 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-04-18 00:55:36,459 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-04-18 00:55:36,872 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:55:36,872 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-04-18 00:55:36,878 [ scc.git] DEBUG Calling 'git fetch origin pull/416/head'
2024-04-18 00:55:37,291 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:55:37,291 [ scc.git] DEBUG * branch refs/pull/416/head -> FETCH_HEAD
2024-04-18 00:55:37,297 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-04-18 00:55:37,851 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:55:37,852 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-04-18 00:55:37,857 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-04-18 00:55:38,286 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:55:38,287 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-04-18 00:55:38,292 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:55:38,292 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:55:38,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:38,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-04-18 00:55:38,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:38,306 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-04-18 00:55:38,345 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:55:38,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:55:38,351 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-04-18 00:55:38,351 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-04-18 00:55:38,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:38,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-04-18 00:55:38,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:38,556 [ 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-04-18 00:55:38,586 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:55:38,590 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-04-18 00:55:38,590 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-04-18 00:55:38,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:38,965 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-04-18 00:55:38,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:38,977 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 416 (Prep 5.8.4) eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-04-18 00:55:39,014 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:55:39,016 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:55:39,019 [ scc.git] DEBUG CHANGELOG.md | 17 +++++++++++++++++
2024-04-18 00:55:39,020 [ scc.git] DEBUG build.gradle | 6 +++---
2024-04-18 00:55:39,020 [ scc.git] DEBUG 2 files changed, 20 insertions(+), 3 deletions(-)
2024-04-18 00:55:39,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:39,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-04-18 00:55:39,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:39,394 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 427 (Handle out of space) f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-04-18 00:55:39,447 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:55:39,455 [ scc.git] DEBUG .../shoola/env/data/ConnectionExceptionHandler.java | 8 +++++++-
2024-04-18 00:55:39,455 [ scc.git] DEBUG .../shoola/env/data/DataServicesFactory.java | 11 +++++++++--
2024-04-18 00:55:39,455 [ scc.git] DEBUG .../openmicroscopy/shoola/env/data/OMEROGateway.java | 18 +++++++++++++-----
2024-04-18 00:55:39,455 [ scc.git] DEBUG .../org/openmicroscopy/shoola/env/ui/TaskBarView.java | 4 ++--
2024-04-18 00:55:39,455 [ scc.git] DEBUG 4 files changed, 31 insertions(+), 10 deletions(-)
2024-04-18 00:55:39,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:39,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-04-18 00:55:39,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:39,813 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-04-18 00:55:39,840 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:55:39,843 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:55:39,845 [ scc.git] DEBUG build.gradle | 3 ++-
2024-04-18 00:55:39,846 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-04-18 00:55:40,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:40,242 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:55:40,279 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:55:40,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:55:40,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:55:40,297 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d0a28bac0> has no local changes
2024-04-18 00:55:40,297 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-insight
Excluded PRs:
- 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 416 jburel 'Prep 5.8.4'
- PR 427 dominikl 'Handle out of space'
- PR 436 dominikl 'Update apache common libs'
Generated by OMERO-insight-push#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/34/)'
2024-04-18 00:55:40,309 [ scc.git] DEBUG [detached HEAD 8a63c97bc] merge master -Dorg -Snone
2024-04-18 00:55:40,309 [ scc.merge] INFO Repository: ome/omero-insight
2024-04-18 00:55:40,309 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-04-18 00:55:40,309 [ scc.merge] INFO Already up to date.
2024-04-18 00:55:40,309 [ scc.merge] INFO
2024-04-18 00:55:40,309 [ scc.merge] INFO Merged PRs:
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 416 jburel 'Prep 5.8.4'
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 427 dominikl 'Handle out of space'
2024-04-18 00:55:40,309 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-04-18 00:55:40,309 [ scc.merge] INFO
2024-04-18 00:55:40,310 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:55:40,310 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-04-18 00:55:40,777 [ scc.config] DEBUG Found github.token
2024-04-18 00:55:40,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-18 00:55:41,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:41,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:55:41,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-18 00:55:41,906 [ scc.gh] DEBUG 2663 remaining from 5000 (Reset at 01:04
2024-04-18 00:55:41,907 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:55:41,910 [ scc.git] DEBUG Check current status
2024-04-18 00:55:41,911 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:55:41,914 [ scc.git] DEBUG 8a63c97bc merge master -Dorg -Snone
2024-04-18 00:55:41,914 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:55:41,963 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:55:42,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-04-18 00:55:42,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:55:43,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:55:43,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:55:44,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:55:44,206 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:55:44,243 [ scc.git] DEBUG Resetting...
2024-04-18 00:55:44,243 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-18 00:55:44,274 [ scc.git] DEBUG HEAD is now at 8a63c97bc merge master -Dorg -Snone
2024-04-18 00:55:44,275 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-18 00:55:44,314 [ scc.git] DEBUG Check current status
2024-04-18 00:55:44,314 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:55:44,318 [ scc.git] DEBUG 8a63c97bc merge master -Dorg -Snone
2024-04-18 00:55:44,319 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:55:44,356 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-18 00:55:44,356 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-18 00:55:44,356 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-18 00:55:44,356 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-18 00:55:44,356 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-18 00:55:44,356 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-18 00:55:44,357 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:55:44,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-04-18 00:55:45,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-04-18 00:55:45,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-04-18 00:55:46,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-04-18 00:55:47,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-04-18 00:55:47,560 [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-04-18 00:55:48,032 [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-04-18 00:55:48,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-04-18 00:55:48,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:55:49,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-04-18 00:55:49,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-04-18 00:55:49,875 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-04-18 00:55:50,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/427 HTTP/1.1" 200 None
2024-04-18 00:55:50,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe HTTP/1.1" 200 None
2024-04-18 00:55:51,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:55:51,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:55:52,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe HTTP/1.1" 200 None
2024-04-18 00:55:52,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/f84dda5c47084c7416e01e6ecca8fede1f92defe?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:55:53,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe HTTP/1.1" 200 None
2024-04-18 00:55:53,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe/status HTTP/1.1" 200 None
2024-04-18 00:55:53,839 [ scc.repo] DEBUG - PR 427 dominikl 'Handle out of space'
2024-04-18 00:55:54,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416 HTTP/1.1" 200 None
2024-04-18 00:55:54,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416/comments HTTP/1.1" 200 None
2024-04-18 00:55:55,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549 HTTP/1.1" 200 None
2024-04-18 00:55:55,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:55:56,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:55:56,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549 HTTP/1.1" 200 None
2024-04-18 00:55:57,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/eb813764c4f20bfc2cfc8ab22c027298ef628549?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:55:57,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549 HTTP/1.1" 200 None
2024-04-18 00:55:58,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549/status HTTP/1.1" 200 None
2024-04-18 00:55:58,233 [ scc.repo] DEBUG - PR 416 jburel 'Prep 5.8.4'
2024-04-18 00:55:58,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-04-18 00:55:59,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-04-18 00:55:59,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-04-18 00:56:00,237 [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-04-18 00:56:00,755 [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-04-18 00:56:01,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-04-18 00:56:01,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:56:02,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-04-18 00:56:02,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-04-18 00:56:02,670 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-04-18 00:56:03,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-04-18 00:56:03,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-04-18 00:56:04,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-04-18 00:56:04,645 [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-04-18 00:56:05,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-04-18 00:56:05,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:56:05,528 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-04-18 00:56:06,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-04-18 00:56:06,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-04-18 00:56:06,610 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:56:06,611 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:56:06,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:06,616 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:56:06,620 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:56:06,620 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:56:06,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:56:06,633 [ scc.git] DEBUG Already up to date.
2024-04-18 00:56:06,633 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-04-18 00:56:07,025 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:56:07,026 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-04-18 00:56:07,031 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-04-18 00:56:07,413 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:56:07,413 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-04-18 00:56:07,419 [ scc.git] DEBUG Calling 'git fetch origin pull/416/head'
2024-04-18 00:56:07,840 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:56:07,841 [ scc.git] DEBUG * branch refs/pull/416/head -> FETCH_HEAD
2024-04-18 00:56:07,848 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-04-18 00:56:08,222 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:56:08,222 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-04-18 00:56:08,228 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-04-18 00:56:08,606 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-04-18 00:56:08,607 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-04-18 00:56:08,612 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:56:08,612 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:56:08,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:08,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-04-18 00:56:08,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:08,628 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-04-18 00:56:08,634 [ scc.git] DEBUG Already up to date.
2024-04-18 00:56:08,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:56:08,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-04-18 00:56:08,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:08,814 [ 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-04-18 00:56:08,821 [ scc.git] DEBUG Already up to date.
2024-04-18 00:56:09,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:56:09,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-04-18 00:56:09,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:09,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 416 (Prep 5.8.4) eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-04-18 00:56:09,229 [ scc.git] DEBUG Already up to date.
2024-04-18 00:56:09,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:56:09,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-04-18 00:56:09,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:09,647 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Handle out of space) f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-04-18 00:56:09,653 [ scc.git] DEBUG Already up to date.
2024-04-18 00:56:10,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:56:10,070 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-04-18 00:56:10,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:10,082 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-04-18 00:56:10,089 [ scc.git] DEBUG Already up to date.
2024-04-18 00:56:10,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:56:10,498 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:56:10,544 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:56:10,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:56:10,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:56:10,600 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:56:10,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f359800bac0> has no local changes
2024-04-18 00:56:10,614 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-insight
Excluded PRs:
- 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 416 jburel 'Prep 5.8.4'
- PR 427 dominikl 'Handle out of space'
- PR 436 dominikl 'Update apache common libs'
Generated by OMERO-insight-push#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/34/)'
2024-04-18 00:56:10,627 [ scc.git] DEBUG [detached HEAD 505838783] merge master -Dorg -Ssuccess-only
2024-04-18 00:56:10,627 [ scc.merge] INFO Repository: ome/omero-insight
2024-04-18 00:56:10,628 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-04-18 00:56:10,628 [ scc.merge] INFO Already up to date.
2024-04-18 00:56:10,628 [ scc.merge] INFO
2024-04-18 00:56:10,628 [ scc.merge] INFO Merged PRs:
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 416 jburel 'Prep 5.8.4'
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 427 dominikl 'Handle out of space'
2024-04-18 00:56:10,628 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-04-18 00:56:10,628 [ scc.merge] INFO
2024-04-18 00:56:10,628 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:56:10,628 [ scc.git] DEBUG Calling 'git remote'
Update component versions
Updating omero-gateway from 5.9.0 to 5.9.1-SNAPSHOT
Commit all component version changes
[detached HEAD d59d23ded] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:56:17,189 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci