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-05-05 00:59:16,080 [ scc.config] DEBUG Found github.token
2024-05-05 00:59:16,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-05 00:59:16,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:16,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:17,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-05 00:59:17,254 [ scc.gh] DEBUG 856 remaining from 5000 (Reset at 01:05
2024-05-05 00:59:17,255 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-05 00:59:17,262 [ scc.git] DEBUG Check current status
2024-05-05 00:59:17,262 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-05 00:59:17,266 [ scc.git] DEBUG 558b56cf6 Merge pull request #422 from jburel/issue_421
2024-05-05 00:59:17,266 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-05 00:59:17,356 [ scc.config] DEBUG Found remote.origin.url
2024-05-05 00:59:17,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-05 00:59:18,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-05 00:59:18,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-05 00:59:19,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-05 00:59:19,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-05 00:59:19,423 [ scc.git] DEBUG Resetting...
2024-05-05 00:59:19,423 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-05 00:59:19,443 [ scc.git] DEBUG HEAD is now at 558b56cf6 Merge pull request #422 from jburel/issue_421
2024-05-05 00:59:19,444 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-05 00:59:19,486 [ scc.git] DEBUG Check current status
2024-05-05 00:59:19,487 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-05 00:59:19,491 [ scc.git] DEBUG 558b56cf6 Merge pull request #422 from jburel/issue_421
2024-05-05 00:59:19,491 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-05 00:59:19,529 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-05 00:59:19,529 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-05 00:59:19,529 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-05 00:59:19,529 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-05 00:59:19,529 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-05 00:59:19,529 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:59:19,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-05 00:59:20,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-05 00:59:20,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-05 00:59:21,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-05 00:59:21,357 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-05 00:59:21,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/427 HTTP/1.1" 200 None
2024-05-05 00:59:21,818 [ scc.repo] DEBUG - PR 427 dominikl 'Handle out of space'
2024-05-05 00:59:22,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416 HTTP/1.1" 200 None
2024-05-05 00:59:22,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416/comments HTTP/1.1" 200 None
2024-05-05 00:59:22,739 [ scc.repo] DEBUG - PR 416 jburel 'Prep 5.8.4'
2024-05-05 00:59:23,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-05 00:59:23,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-05 00:59:23,650 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-05 00:59:24,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-05 00:59:24,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-05 00:59:24,583 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-05 00:59:25,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-05 00:59:25,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-05 00:59:25,564 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:59:25,564 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:59:25,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:25,569 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:59:25,572 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:59:25,572 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:59:25,577 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:59:25,581 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:25,582 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-05 00:59:26,103 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:26,103 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-05 00:59:26,108 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-05 00:59:26,604 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:26,604 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-05 00:59:26,609 [ scc.git] DEBUG Calling 'git fetch origin pull/416/head'
2024-05-05 00:59:27,051 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:27,052 [ scc.git] DEBUG * branch refs/pull/416/head -> FETCH_HEAD
2024-05-05 00:59:27,056 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-05-05 00:59:27,550 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:27,550 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-05-05 00:59:27,556 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-05 00:59:27,962 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:27,962 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-05 00:59:27,968 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:59:27,968 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:59:27,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:27,973 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-05 00:59:27,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:27,986 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-05 00:59:28,009 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-05 00:59:28,012 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:59:28,016 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-05-05 00:59:28,016 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-05-05 00:59:28,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:28,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-05 00:59:28,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:28,196 [ 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-05-05 00:59:28,233 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:59:28,236 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-05-05 00:59:28,236 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-05-05 00:59:28,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:28,604 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-05-05 00:59:28,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:28,616 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 416 (Prep 5.8.4) eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-05-05 00:59:28,684 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-05 00:59:28,686 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:59:28,690 [ scc.git] DEBUG CHANGELOG.md | 17 +++++++++++++++++
2024-05-05 00:59:28,690 [ scc.git] DEBUG build.gradle | 6 +++---
2024-05-05 00:59:28,690 [ scc.git] DEBUG 2 files changed, 20 insertions(+), 3 deletions(-)
2024-05-05 00:59:29,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:29,012 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-05-05 00:59:29,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:29,038 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 427 (Handle out of space) f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-05-05 00:59:29,092 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:59:29,099 [ scc.git] DEBUG .../shoola/env/data/ConnectionExceptionHandler.java | 8 +++++++-
2024-05-05 00:59:29,099 [ scc.git] DEBUG .../shoola/env/data/DataServicesFactory.java | 11 +++++++++--
2024-05-05 00:59:29,099 [ scc.git] DEBUG .../openmicroscopy/shoola/env/data/OMEROGateway.java | 18 +++++++++++++-----
2024-05-05 00:59:29,099 [ scc.git] DEBUG .../org/openmicroscopy/shoola/env/ui/TaskBarView.java | 4 ++--
2024-05-05 00:59:29,099 [ scc.git] DEBUG 4 files changed, 31 insertions(+), 10 deletions(-)
2024-05-05 00:59:29,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:29,417 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-05 00:59:29,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:29,432 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-05 00:59:29,488 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-05 00:59:29,491 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-05 00:59:29,494 [ scc.git] DEBUG build.gradle | 3 ++-
2024-05-05 00:59:29,494 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-05-05 00:59:29,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:29,837 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:59:29,879 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:59:29,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:29,883 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:59:29,953 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc782c0bac0> has no local changes
2024-05-05 00:59:29,953 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/50/)'
2024-05-05 00:59:29,968 [ scc.git] DEBUG [detached HEAD 4b7fdc792] merge master -Dorg -Snone
2024-05-05 00:59:29,969 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-05 00:59:29,969 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-05 00:59:29,969 [ scc.merge] INFO Already up to date.
2024-05-05 00:59:29,969 [ scc.merge] INFO
2024-05-05 00:59:29,969 [ scc.merge] INFO Merged PRs:
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 416 jburel 'Prep 5.8.4'
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 427 dominikl 'Handle out of space'
2024-05-05 00:59:29,969 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-05 00:59:29,969 [ scc.merge] INFO
2024-05-05 00:59:29,969 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-05 00:59:29,969 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-05-05 00:59:30,440 [ scc.config] DEBUG Found github.token
2024-05-05 00:59:30,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-05 00:59:30,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:31,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:31,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-05 00:59:31,476 [ scc.gh] DEBUG 774 remaining from 5000 (Reset at 01:05
2024-05-05 00:59:31,477 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-05 00:59:31,481 [ scc.git] DEBUG Check current status
2024-05-05 00:59:31,481 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-05 00:59:31,485 [ scc.git] DEBUG 4b7fdc792 merge master -Dorg -Snone
2024-05-05 00:59:31,485 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-05 00:59:31,528 [ scc.config] DEBUG Found remote.origin.url
2024-05-05 00:59:31,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-05 00:59:32,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-05 00:59:32,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-05 00:59:33,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-05 00:59:33,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-05 00:59:33,649 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:59:33,689 [ scc.git] DEBUG Resetting...
2024-05-05 00:59:33,689 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-05 00:59:33,710 [ scc.git] DEBUG HEAD is now at 4b7fdc792 merge master -Dorg -Snone
2024-05-05 00:59:33,710 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-05 00:59:33,756 [ scc.git] DEBUG Check current status
2024-05-05 00:59:33,756 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-05 00:59:33,761 [ scc.git] DEBUG 4b7fdc792 merge master -Dorg -Snone
2024-05-05 00:59:33,761 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-05 00:59:33,804 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-05 00:59:33,805 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-05 00:59:33,805 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-05 00:59:33,805 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-05 00:59:33,805 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-05 00:59:33,805 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-05 00:59:33,805 [ scc.repo] DEBUG ## PRs found:
2024-05-05 00:59:34,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-05 00:59:34,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-05 00:59:35,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-05 00:59:35,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-05 00:59:36,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-05 00:59:36,525 [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-05-05 00:59:37,031 [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-05-05 00:59:37,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-05 00:59:37,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None
2024-05-05 00:59:38,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-05 00:59:38,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-05-05 00:59:38,799 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-05 00:59:39,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/427 HTTP/1.1" 200 None
2024-05-05 00:59:39,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe HTTP/1.1" 200 None
2024-05-05 00:59:40,205 [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-05-05 00:59:40,679 [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-05-05 00:59:41,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe HTTP/1.1" 200 None
2024-05-05 00:59:41,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/f84dda5c47084c7416e01e6ecca8fede1f92defe?per_page=1 HTTP/1.1" 200 None
2024-05-05 00:59:42,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe HTTP/1.1" 200 None
2024-05-05 00:59:42,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f84dda5c47084c7416e01e6ecca8fede1f92defe/status HTTP/1.1" 200 None
2024-05-05 00:59:42,502 [ scc.repo] DEBUG - PR 427 dominikl 'Handle out of space'
2024-05-05 00:59:42,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416 HTTP/1.1" 200 None
2024-05-05 00:59:43,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/416/comments HTTP/1.1" 200 None
2024-05-05 00:59:43,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549 HTTP/1.1" 200 None
2024-05-05 00:59:44,436 [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-05-05 00:59:44,894 [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-05-05 00:59:45,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549 HTTP/1.1" 200 None
2024-05-05 00:59:45,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/eb813764c4f20bfc2cfc8ab22c027298ef628549?per_page=1 HTTP/1.1" 200 None
2024-05-05 00:59:46,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549 HTTP/1.1" 200 None
2024-05-05 00:59:46,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/eb813764c4f20bfc2cfc8ab22c027298ef628549/status HTTP/1.1" 200 None
2024-05-05 00:59:46,743 [ scc.repo] DEBUG - PR 416 jburel 'Prep 5.8.4'
2024-05-05 00:59:47,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-05 00:59:47,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-05 00:59:48,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-05 00:59:48,601 [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-05-05 00:59:49,063 [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-05-05 00:59:49,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-05 00:59:49,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-05-05 00:59:50,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-05 00:59:50,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-05-05 00:59:50,890 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-05 00:59:51,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-05 00:59:51,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-05 00:59:52,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-05 00:59:52,798 [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-05-05 00:59:53,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-05 00:59:53,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2
2024-05-05 00:59:53,707 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-05 00:59:54,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-05 00:59:54,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-05 00:59:54,702 [ scc.repo] DEBUG ## Branches found:
2024-05-05 00:59:54,702 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:59:54,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:54,706 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-05 00:59:54,710 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-05 00:59:54,710 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-05 00:59:54,715 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-05 00:59:54,734 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:54,735 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-05 00:59:55,157 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:55,157 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-05 00:59:55,163 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-05 00:59:55,540 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:55,541 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-05 00:59:55,545 [ scc.git] DEBUG Calling 'git fetch origin pull/416/head'
2024-05-05 00:59:55,929 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:55,930 [ scc.git] DEBUG * branch refs/pull/416/head -> FETCH_HEAD
2024-05-05 00:59:55,935 [ scc.git] DEBUG Calling 'git fetch origin pull/427/head'
2024-05-05 00:59:56,323 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:56,324 [ scc.git] DEBUG * branch refs/pull/427/head -> FETCH_HEAD
2024-05-05 00:59:56,330 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-05 00:59:56,726 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-05 00:59:56,727 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-05 00:59:56,731 [ scc.git] DEBUG ## Unique users: []
2024-05-05 00:59:56,732 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:59:56,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:56,737 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-05 00:59:56,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:56,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-05 00:59:56,752 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:56,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:56,912 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-05 00:59:56,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:56,922 [ 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-05-05 00:59:56,929 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:57,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:57,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-05-05 00:59:57,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:57,336 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 416 (Prep 5.8.4) eb813764c4f20bfc2cfc8ab22c027298ef628549'
2024-05-05 00:59:57,342 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:57,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:57,735 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-05-05 00:59:57,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:57,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 427 (Handle out of space) f84dda5c47084c7416e01e6ecca8fede1f92defe'
2024-05-05 00:59:57,751 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:58,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:58,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-05 00:59:58,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:58,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-05 00:59:58,223 [ scc.git] DEBUG Already up to date.
2024-05-05 00:59:58,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-05 00:59:58,626 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-05 00:59:58,669 [ scc.git] DEBUG Get sha1 of %s
2024-05-05 00:59:58,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-05 00:59:58,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-05 00:59:58,719 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-05 00:59:58,731 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd069d4ac0> has no local changes
2024-05-05 00:59:58,732 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/50/)'
2024-05-05 00:59:58,746 [ scc.git] DEBUG [detached HEAD 1ad926f15] merge master -Dorg -Ssuccess-only
2024-05-05 00:59:58,746 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-05 00:59:58,746 [ scc.merge] INFO Excluded PRs:
2024-05-05 00:59:58,746 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-05 00:59:58,746 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-05 00:59:58,746 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-05 00:59:58,746 [ scc.merge] INFO Already up to date.
2024-05-05 00:59:58,746 [ scc.merge] INFO
2024-05-05 00:59:58,746 [ scc.merge] INFO Merged PRs:
2024-05-05 00:59:58,747 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-05 00:59:58,747 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-05 00:59:58,747 [ scc.merge] INFO - PR 416 jburel 'Prep 5.8.4'
2024-05-05 00:59:58,747 [ scc.merge] INFO - PR 427 dominikl 'Handle out of space'
2024-05-05 00:59:58,747 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-05 00:59:58,747 [ scc.merge] INFO
2024-05-05 00:59:58,747 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-05 00:59:58,747 [ 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 f88ee384b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-05 01:00:05,224 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci
![[Jenkins]](/jenkins/static/4be69ed6/images/svgs/logo.svg){kind=logo}
