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-07-11 01:01:38,432 [ scc.config] DEBUG Found github.token
2024-07-11 01:01:38,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-11 01:01:38,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:39,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:39,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-11 01:01:39,464 [ scc.gh] DEBUG 3522 remaining from 5000 (Reset at 01:07
2024-07-11 01:01:39,464 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-11 01:01:39,469 [ scc.git] DEBUG Check current status
2024-07-11 01:01:39,469 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-11 01:01:39,472 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-11 01:01:39,473 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-11 01:01:39,521 [ scc.config] DEBUG Found remote.origin.url
2024-07-11 01:01:39,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-11 01:01:40,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-11 01:01:40,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-11 01:01:41,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-11 01:01:41,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-11 01:01:41,690 [ scc.git] DEBUG Resetting...
2024-07-11 01:01:41,690 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-11 01:01:41,709 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-11 01:01:41,709 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-11 01:01:41,752 [ scc.git] DEBUG Check current status
2024-07-11 01:01:41,753 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-11 01:01:41,757 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-11 01:01:41,757 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-11 01:01:41,802 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-11 01:01:41,802 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-11 01:01:41,802 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-11 01:01:41,802 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-11 01:01:41,802 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-11 01:01:41,802 [ scc.repo] DEBUG ## PRs found:
2024-07-11 01:01:42,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-11 01:01:42,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-11 01:01:43,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-11 01:01:43,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-11 01:01:43,699 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-11 01:01:44,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-11 01:01:44,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-11 01:01:44,638 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-11 01:01:45,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-11 01:01:45,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-11 01:01:45,595 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-11 01:01:46,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-11 01:01:46,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-11 01:01:46,675 [ scc.repo] DEBUG ## Branches found:
2024-07-11 01:01:46,676 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 01:01:46,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:01:46,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 01:01:46,685 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 01:01:46,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 01:01:46,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 01:01:46,698 [ scc.git] DEBUG Already up to date.
2024-07-11 01:01:46,698 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-11 01:01:47,126 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-11 01:01:47,127 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-11 01:01:47,133 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-11 01:01:47,558 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-11 01:01:47,559 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-11 01:01:47,564 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-11 01:01:48,087 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-11 01:01:48,088 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-11 01:01:48,093 [ scc.git] DEBUG ## Unique users: []
2024-07-11 01:01:48,093 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 01:01:48,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:01:48,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-11 01:01:48,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:01:48,110 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-11 01:01:48,134 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-11 01:01:48,137 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 01:01:48,141 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-07-11 01:01:48,141 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-07-11 01:01:48,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:48,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-11 01:01:48,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:01:48,331 [ 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-07-11 01:01:48,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 01:01:48,455 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-07-11 01:01:48,455 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-07-11 01:01:48,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:48,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-11 01:01:48,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:01:48,742 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-11 01:01:48,821 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-11 01:01:48,824 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 01:01:48,827 [ scc.git] DEBUG build.gradle | 3 ++-
2024-07-11 01:01:48,827 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-07-11 01:01:49,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:49,135 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 01:01:49,183 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 01:01:49,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:01:49,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 01:01:49,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f88695d60> has no local changes
2024-07-11 01:01:49,431 [ 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 436 dominikl 'Update apache common libs'
Generated by OMERO-insight-push#109 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/109/)'
2024-07-11 01:01:49,445 [ scc.git] DEBUG [detached HEAD 84b1b07d7] merge master -Dorg -Snone
2024-07-11 01:01:49,445 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-11 01:01:49,445 [ scc.merge] INFO Excluded PRs:
2024-07-11 01:01:49,445 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-11 01:01:49,445 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-11 01:01:49,445 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-11 01:01:49,445 [ scc.merge] INFO Already up to date.
2024-07-11 01:01:49,445 [ scc.merge] INFO
2024-07-11 01:01:49,445 [ scc.merge] INFO Merged PRs:
2024-07-11 01:01:49,445 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-11 01:01:49,445 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-11 01:01:49,445 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-11 01:01:49,445 [ scc.merge] INFO
2024-07-11 01:01:49,445 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-11 01:01:49,446 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-07-11 01:01:50,074 [ scc.config] DEBUG Found github.token
2024-07-11 01:01:50,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-11 01:01:50,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:50,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:01:51,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-11 01:01:51,481 [ scc.gh] DEBUG 3477 remaining from 5000 (Reset at 01:07
2024-07-11 01:01:51,482 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-11 01:01:51,489 [ scc.git] DEBUG Check current status
2024-07-11 01:01:51,489 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-11 01:01:51,495 [ scc.git] DEBUG 84b1b07d7 merge master -Dorg -Snone
2024-07-11 01:01:51,495 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-11 01:01:51,549 [ scc.config] DEBUG Found remote.origin.url
2024-07-11 01:01:52,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-11 01:01:52,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-11 01:01:53,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-11 01:01:53,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-11 01:01:54,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-11 01:01:54,066 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 01:01:54,112 [ scc.git] DEBUG Resetting...
2024-07-11 01:01:54,112 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-11 01:01:54,130 [ scc.git] DEBUG HEAD is now at 84b1b07d7 merge master -Dorg -Snone
2024-07-11 01:01:54,131 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-11 01:01:54,176 [ scc.git] DEBUG Check current status
2024-07-11 01:01:54,176 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-11 01:01:54,181 [ scc.git] DEBUG 84b1b07d7 merge master -Dorg -Snone
2024-07-11 01:01:54,182 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-11 01:01:54,231 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-11 01:01:54,232 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-11 01:01:54,232 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-11 01:01:54,232 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-11 01:01:54,232 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-11 01:01:54,232 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-11 01:01:54,232 [ scc.repo] DEBUG ## PRs found:
2024-07-11 01:01:54,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-11 01:01:55,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-11 01:01:55,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-11 01:01:56,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-11 01:01:56,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-11 01:01:57,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-11 01:01:57,798 [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-07-11 01:01:58,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-11 01:01:58,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-07-11 01:01:59,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-11 01:01:59,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-07-11 01:01:59,957 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-11 01:02:00,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-11 01:02:01,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-11 01:02:01,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-11 01:02:02,144 [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-07-11 01:02:02,688 [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-07-11 01:02:03,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-11 01:02:03,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-07-11 01:02:04,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-11 01:02:04,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-07-11 01:02:04,771 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-11 01:02:05,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-11 01:02:05,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-11 01:02:06,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-11 01:02:06,912 [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-07-11 01:02:07,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-11 01:02:07,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2
2024-07-11 01:02:07,956 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-11 01:02:08,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-11 01:02:09,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-11 01:02:09,145 [ scc.repo] DEBUG ## Branches found:
2024-07-11 01:02:09,145 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 01:02:09,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:02:09,152 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 01:02:09,157 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 01:02:09,157 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 01:02:09,164 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 01:02:09,172 [ scc.git] DEBUG Already up to date.
2024-07-11 01:02:09,172 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-11 01:02:09,551 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-11 01:02:09,551 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-11 01:02:09,556 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-11 01:02:10,252 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-11 01:02:10,253 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-11 01:02:10,261 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-11 01:02:10,606 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-11 01:02:10,606 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-11 01:02:10,610 [ scc.git] DEBUG ## Unique users: []
2024-07-11 01:02:10,611 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 01:02:10,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:02:10,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-11 01:02:10,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:02:10,625 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-11 01:02:10,645 [ scc.git] DEBUG Already up to date.
2024-07-11 01:02:10,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:02:10,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-11 01:02:10,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:02:10,872 [ 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-07-11 01:02:10,879 [ scc.git] DEBUG Already up to date.
2024-07-11 01:02:11,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:02:11,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-11 01:02:11,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:02:11,354 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-11 01:02:11,362 [ scc.git] DEBUG Already up to date.
2024-07-11 01:02:11,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 01:02:11,825 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 01:02:11,885 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 01:02:11,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 01:02:11,893 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 01:02:11,948 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 01:02:11,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6f4b043d60> has no local changes
2024-07-11 01:02:11,969 [ 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 436 dominikl 'Update apache common libs'
Generated by OMERO-insight-push#109 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/109/)'
2024-07-11 01:02:11,987 [ scc.git] DEBUG [detached HEAD 7f52afe54] merge master -Dorg -Ssuccess-only
2024-07-11 01:02:11,987 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-11 01:02:11,987 [ scc.merge] INFO Excluded PRs:
2024-07-11 01:02:11,987 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-11 01:02:11,987 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-11 01:02:11,987 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-11 01:02:11,987 [ scc.merge] INFO Already up to date.
2024-07-11 01:02:11,987 [ scc.merge] INFO
2024-07-11 01:02:11,987 [ scc.merge] INFO Merged PRs:
2024-07-11 01:02:11,987 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-11 01:02:11,987 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-11 01:02:11,987 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-11 01:02:11,987 [ scc.merge] INFO
2024-07-11 01:02:11,988 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-11 01:02:11,988 [ scc.git] DEBUG Calling 'git remote'
Update component versions
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
Commit all component version changes
[detached HEAD 97a1d589d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-11 01:02:18,809 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci
![[Jenkins]](/jenkins/static/a3382f31/images/svgs/logo.svg){kind=logo}
