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-24 00:58:06,122 [ scc.config] DEBUG Found github.token
2024-05-24 00:58:06,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-24 00:58:06,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:06,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:07,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-24 00:58:07,137 [ scc.gh] DEBUG 2847 remaining from 5000 (Reset at 01:05
2024-05-24 00:58:07,138 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-24 00:58:07,143 [ scc.git] DEBUG Check current status
2024-05-24 00:58:07,143 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-24 00:58:07,147 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-24 00:58:07,147 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-24 00:58:07,189 [ scc.config] DEBUG Found remote.origin.url
2024-05-24 00:58:07,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-24 00:58:08,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-24 00:58:08,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-24 00:58:08,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-24 00:58:09,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-24 00:58:09,358 [ scc.git] DEBUG Resetting...
2024-05-24 00:58:09,358 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-24 00:58:09,376 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-24 00:58:09,377 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-24 00:58:09,417 [ scc.git] DEBUG Check current status
2024-05-24 00:58:09,417 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-24 00:58:09,421 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-24 00:58:09,421 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-24 00:58:09,460 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-24 00:58:09,460 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-24 00:58:09,460 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-24 00:58:09,460 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-24 00:58:09,460 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-24 00:58:09,460 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:58:09,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-24 00:58:10,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-24 00:58:10,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-24 00:58:11,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-24 00:58:11,300 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-24 00:58:11,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-24 00:58:12,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-24 00:58:12,244 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-24 00:58:12,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-24 00:58:13,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-24 00:58:13,186 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-24 00:58:13,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-24 00:58:14,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-24 00:58:14,206 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:58:14,206 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:58:14,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:14,213 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:58:14,218 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:58:14,218 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:58:14,224 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:58:14,230 [ scc.git] DEBUG Already up to date.
2024-05-24 00:58:14,230 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-24 00:58:14,643 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-24 00:58:14,643 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-24 00:58:14,651 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-24 00:58:15,168 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-24 00:58:15,169 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-24 00:58:15,175 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-24 00:58:15,555 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-24 00:58:15,555 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-24 00:58:15,561 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:58:15,561 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:58:15,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:15,569 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-24 00:58:15,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:15,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-24 00:58:15,664 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-24 00:58:15,667 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:58:15,671 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-05-24 00:58:15,671 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-05-24 00:58:15,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:15,839 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-24 00:58:15,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:15,852 [ 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-24 00:58:16,024 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:58:16,028 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-05-24 00:58:16,028 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-05-24 00:58:16,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:16,247 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-24 00:58:16,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:16,258 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-24 00:58:16,304 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-24 00:58:16,307 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-24 00:58:16,311 [ scc.git] DEBUG build.gradle | 3 ++-
2024-05-24 00:58:16,311 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-05-24 00:58:16,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:16,664 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:58:16,714 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:58:16,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:16,722 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:58:16,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fab890da130> has no local changes
2024-05-24 00:58:16,748 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/69/)'
2024-05-24 00:58:16,764 [ scc.git] DEBUG [detached HEAD 88a1f9c8a] merge master -Dorg -Snone
2024-05-24 00:58:16,765 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-24 00:58:16,765 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:58:16,765 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-24 00:58:16,765 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-24 00:58:16,765 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-24 00:58:16,765 [ scc.merge] INFO Already up to date.
2024-05-24 00:58:16,765 [ scc.merge] INFO
2024-05-24 00:58:16,765 [ scc.merge] INFO Merged PRs:
2024-05-24 00:58:16,765 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-24 00:58:16,765 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-24 00:58:16,765 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-24 00:58:16,765 [ scc.merge] INFO
2024-05-24 00:58:16,765 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-24 00:58:16,765 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-05-24 00:58:17,330 [ scc.config] DEBUG Found github.token
2024-05-24 00:58:17,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-24 00:58:17,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:17,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:18,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-24 00:58:18,373 [ scc.gh] DEBUG 2804 remaining from 5000 (Reset at 01:05
2024-05-24 00:58:18,374 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-24 00:58:18,381 [ scc.git] DEBUG Check current status
2024-05-24 00:58:18,381 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-24 00:58:18,388 [ scc.git] DEBUG 88a1f9c8a merge master -Dorg -Snone
2024-05-24 00:58:18,389 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-24 00:58:18,445 [ scc.config] DEBUG Found remote.origin.url
2024-05-24 00:58:18,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-24 00:58:19,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-24 00:58:19,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-24 00:58:20,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-24 00:58:20,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-24 00:58:20,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:58:20,677 [ scc.git] DEBUG Resetting...
2024-05-24 00:58:20,677 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-24 00:58:20,696 [ scc.git] DEBUG HEAD is now at 88a1f9c8a merge master -Dorg -Snone
2024-05-24 00:58:20,697 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-24 00:58:20,760 [ scc.git] DEBUG Check current status
2024-05-24 00:58:20,760 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-24 00:58:20,765 [ scc.git] DEBUG 88a1f9c8a merge master -Dorg -Snone
2024-05-24 00:58:20,766 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-24 00:58:20,818 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-24 00:58:20,818 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-24 00:58:20,818 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-24 00:58:20,818 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-24 00:58:20,818 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-24 00:58:20,818 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-24 00:58:20,818 [ scc.repo] DEBUG ## PRs found:
2024-05-24 00:58:21,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-24 00:58:21,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-24 00:58:22,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-24 00:58:22,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-24 00:58:23,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-24 00:58:23,607 [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-24 00:58:24,111 [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-24 00:58:24,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-24 00:58:25,026 [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-24 00:58:25,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-24 00:58:25,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-05-24 00:58:25,918 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-24 00:58:26,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-24 00:58:26,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-24 00:58:27,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-24 00:58:27,851 [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-24 00:58:28,328 [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-24 00:58:28,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-24 00:58:29,264 [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-24 00:58:29,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-24 00:58:30,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-05-24 00:58:30,151 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-24 00:58:30,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-24 00:58:31,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-24 00:58:31,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-24 00:58:32,049 [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-24 00:58:32,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-24 00:58:32,978 [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-24 00:58:32,980 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-24 00:58:33,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-24 00:58:33,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-24 00:58:33,983 [ scc.repo] DEBUG ## Branches found:
2024-05-24 00:58:33,983 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:58:33,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:33,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-24 00:58:33,991 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-24 00:58:33,991 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-24 00:58:33,995 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-24 00:58:34,002 [ scc.git] DEBUG Already up to date.
2024-05-24 00:58:34,002 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-24 00:58:34,421 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-24 00:58:34,421 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-24 00:58:34,428 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-24 00:58:34,871 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-24 00:58:34,872 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-24 00:58:34,879 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-24 00:58:35,293 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-24 00:58:35,294 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-24 00:58:35,311 [ scc.git] DEBUG ## Unique users: []
2024-05-24 00:58:35,312 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:58:35,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:35,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-24 00:58:35,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:35,376 [ 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-24 00:58:35,397 [ scc.git] DEBUG Already up to date.
2024-05-24 00:58:35,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:35,571 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-24 00:58:35,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:35,582 [ 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-24 00:58:35,589 [ scc.git] DEBUG Already up to date.
2024-05-24 00:58:35,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:35,979 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-24 00:58:35,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:35,993 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-24 00:58:36,000 [ scc.git] DEBUG Already up to date.
2024-05-24 00:58:36,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-24 00:58:36,397 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-24 00:58:36,439 [ scc.git] DEBUG Get sha1 of %s
2024-05-24 00:58:36,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-24 00:58:36,443 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-24 00:58:36,483 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-24 00:58:36,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f24629f9130> has no local changes
2024-05-24 00:58:36,494 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/69/)'
2024-05-24 00:58:36,507 [ scc.git] DEBUG [detached HEAD 03e9f2e69] merge master -Dorg -Ssuccess-only
2024-05-24 00:58:36,508 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-24 00:58:36,508 [ scc.merge] INFO Excluded PRs:
2024-05-24 00:58:36,508 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-24 00:58:36,508 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-24 00:58:36,508 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-24 00:58:36,508 [ scc.merge] INFO Already up to date.
2024-05-24 00:58:36,508 [ scc.merge] INFO
2024-05-24 00:58:36,508 [ scc.merge] INFO Merged PRs:
2024-05-24 00:58:36,508 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-24 00:58:36,508 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-24 00:58:36,508 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-24 00:58:36,508 [ scc.merge] INFO
2024-05-24 00:58:36,508 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-24 00:58:36,508 [ 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 2a8099200] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-24 00:58:42,883 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci
![[Jenkins]](/jenkins/static/d8ca237c/images/svgs/logo.svg){kind=logo}
