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-15 01:00:33,163 [ scc.config] DEBUG Found github.token
2024-07-15 01:00:33,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-15 01:00:33,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:33,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:34,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-15 01:00:34,201 [ scc.gh] DEBUG 2470 remaining from 5000 (Reset at 01:07
2024-07-15 01:00:34,203 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-15 01:00:34,212 [ scc.git] DEBUG Check current status
2024-07-15 01:00:34,213 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-15 01:00:34,219 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-15 01:00:34,219 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-15 01:00:34,269 [ scc.config] DEBUG Found remote.origin.url
2024-07-15 01:00:34,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-15 01:00:35,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-15 01:00:35,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-15 01:00:36,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-15 01:00:36,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-15 01:00:36,430 [ scc.git] DEBUG Resetting...
2024-07-15 01:00:36,430 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-15 01:00:36,447 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-15 01:00:36,448 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-15 01:00:36,493 [ scc.git] DEBUG Check current status
2024-07-15 01:00:36,494 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-15 01:00:36,499 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-15 01:00:36,499 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-15 01:00:36,541 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-15 01:00:36,541 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-15 01:00:36,542 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-15 01:00:36,542 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-15 01:00:36,542 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-15 01:00:36,542 [ scc.repo] DEBUG ## PRs found:
2024-07-15 01:00:37,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-15 01:00:37,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-15 01:00:37,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-15 01:00:38,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-15 01:00:38,412 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-15 01:00:38,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-15 01:00:39,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-15 01:00:39,404 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-15 01:00:39,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-15 01:00:40,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-15 01:00:40,313 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-15 01:00:40,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-15 01:00:41,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-15 01:00:41,371 [ scc.repo] DEBUG ## Branches found:
2024-07-15 01:00:41,371 [ scc.git] DEBUG Get sha1 of %s
2024-07-15 01:00:41,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:00:41,375 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-15 01:00:41,379 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-15 01:00:41,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-15 01:00:41,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-15 01:00:41,387 [ scc.git] DEBUG Already up to date.
2024-07-15 01:00:41,388 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-15 01:00:41,746 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-15 01:00:41,746 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-15 01:00:41,751 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-15 01:00:42,185 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-15 01:00:42,185 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-15 01:00:42,191 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-15 01:00:42,605 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-15 01:00:42,605 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-15 01:00:42,611 [ scc.git] DEBUG ## Unique users: []
2024-07-15 01:00:42,612 [ scc.git] DEBUG Get sha1 of %s
2024-07-15 01:00:42,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:00:42,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-15 01:00:42,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:00:42,628 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-15 01:00:42,677 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-15 01:00:42,680 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-15 01:00:42,682 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-07-15 01:00:42,682 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-07-15 01:00:42,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:42,854 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-15 01:00:42,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:00:42,865 [ 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-15 01:00:43,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-15 01:00:43,051 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-07-15 01:00:43,051 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-07-15 01:00:43,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:43,254 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-15 01:00:43,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:00:43,273 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-15 01:00:43,309 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-15 01:00:43,312 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-15 01:00:43,315 [ scc.git] DEBUG build.gradle | 3 ++-
2024-07-15 01:00:43,315 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-07-15 01:00:43,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:43,654 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-15 01:00:43,694 [ scc.git] DEBUG Get sha1 of %s
2024-07-15 01:00:43,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:00:43,698 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-15 01:00:43,737 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f57e2bbad60> has no local changes
2024-07-15 01:00:43,738 [ 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#113 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/113/)'
2024-07-15 01:00:43,761 [ scc.git] DEBUG [detached HEAD f6fd2a71d] merge master -Dorg -Snone
2024-07-15 01:00:43,762 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-15 01:00:43,762 [ scc.merge] INFO Excluded PRs:
2024-07-15 01:00:43,762 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-15 01:00:43,762 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-15 01:00:43,762 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-15 01:00:43,762 [ scc.merge] INFO Already up to date.
2024-07-15 01:00:43,762 [ scc.merge] INFO
2024-07-15 01:00:43,762 [ scc.merge] INFO Merged PRs:
2024-07-15 01:00:43,762 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-15 01:00:43,762 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-15 01:00:43,762 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-15 01:00:43,762 [ scc.merge] INFO
2024-07-15 01:00:43,762 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-15 01:00:43,762 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-07-15 01:00:44,287 [ scc.config] DEBUG Found github.token
2024-07-15 01:00:44,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-15 01:00:44,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:44,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:00:45,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-15 01:00:45,354 [ scc.gh] DEBUG 2440 remaining from 5000 (Reset at 01:07
2024-07-15 01:00:45,354 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-15 01:00:45,359 [ scc.git] DEBUG Check current status
2024-07-15 01:00:45,359 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-15 01:00:45,362 [ scc.git] DEBUG f6fd2a71d merge master -Dorg -Snone
2024-07-15 01:00:45,362 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-15 01:00:45,405 [ scc.config] DEBUG Found remote.origin.url
2024-07-15 01:00:45,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-15 01:00:46,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-15 01:00:46,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-15 01:00:47,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-15 01:00:47,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-15 01:00:47,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-15 01:00:47,610 [ scc.git] DEBUG Resetting...
2024-07-15 01:00:47,610 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-15 01:00:47,626 [ scc.git] DEBUG HEAD is now at f6fd2a71d merge master -Dorg -Snone
2024-07-15 01:00:47,627 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-15 01:00:47,664 [ scc.git] DEBUG Check current status
2024-07-15 01:00:47,665 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-15 01:00:47,668 [ scc.git] DEBUG f6fd2a71d merge master -Dorg -Snone
2024-07-15 01:00:47,668 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-15 01:00:47,703 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-15 01:00:47,704 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-15 01:00:47,704 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-15 01:00:47,704 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-15 01:00:47,704 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-15 01:00:47,704 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-15 01:00:47,704 [ scc.repo] DEBUG ## PRs found:
2024-07-15 01:00:48,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-15 01:00:48,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-15 01:00:49,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-15 01:00:49,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-15 01:00:50,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-15 01:00:50,609 [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-15 01:00:51,108 [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-15 01:00:51,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-15 01:00:52,044 [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-15 01:00:52,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-15 01:00:52,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-07-15 01:00:52,968 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-15 01:00:53,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-15 01:00:53,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-15 01:00:54,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-15 01:00:54,902 [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-15 01:00:55,372 [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-15 01:00:55,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-15 01:00:56,327 [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-15 01:00:56,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-15 01:00:57,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-07-15 01:00:57,206 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-15 01:00:57,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-15 01:00:58,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-15 01:00:58,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-15 01:00:59,175 [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-15 01:00:59,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-15 01:01:00,108 [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-15 01:01:00,109 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-15 01:01:00,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-15 01:01:01,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-15 01:01:01,130 [ scc.repo] DEBUG ## Branches found:
2024-07-15 01:01:01,130 [ scc.git] DEBUG Get sha1 of %s
2024-07-15 01:01:01,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:01:01,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-15 01:01:01,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-15 01:01:01,139 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-15 01:01:01,144 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-15 01:01:01,152 [ scc.git] DEBUG Already up to date.
2024-07-15 01:01:01,152 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-15 01:01:01,516 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-15 01:01:01,516 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-15 01:01:01,522 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-15 01:01:01,913 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-15 01:01:01,914 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-15 01:01:01,919 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-15 01:01:02,258 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-15 01:01:02,258 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-15 01:01:02,263 [ scc.git] DEBUG ## Unique users: []
2024-07-15 01:01:02,263 [ scc.git] DEBUG Get sha1 of %s
2024-07-15 01:01:02,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:01:02,267 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-15 01:01:02,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:01:02,276 [ 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-15 01:01:02,282 [ scc.git] DEBUG Already up to date.
2024-07-15 01:01:02,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:01:02,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-15 01:01:02,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:01:02,463 [ 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-15 01:01:02,470 [ scc.git] DEBUG Already up to date.
2024-07-15 01:01:02,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:01:02,861 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-15 01:01:02,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:01:02,871 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-15 01:01:02,877 [ scc.git] DEBUG Already up to date.
2024-07-15 01:01:03,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-15 01:01:03,277 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-15 01:01:03,320 [ scc.git] DEBUG Get sha1 of %s
2024-07-15 01:01:03,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-15 01:01:03,324 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-15 01:01:03,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-15 01:01:03,386 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f219b6f4d60> has no local changes
2024-07-15 01:01:03,387 [ 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#113 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/113/)'
2024-07-15 01:01:03,399 [ scc.git] DEBUG [detached HEAD 2d37186d1] merge master -Dorg -Ssuccess-only
2024-07-15 01:01:03,399 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-15 01:01:03,399 [ scc.merge] INFO Excluded PRs:
2024-07-15 01:01:03,399 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-15 01:01:03,399 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-15 01:01:03,399 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-15 01:01:03,399 [ scc.merge] INFO Already up to date.
2024-07-15 01:01:03,399 [ scc.merge] INFO
2024-07-15 01:01:03,399 [ scc.merge] INFO Merged PRs:
2024-07-15 01:01:03,399 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-15 01:01:03,399 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-15 01:01:03,400 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-15 01:01:03,400 [ scc.merge] INFO
2024-07-15 01:01:03,400 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-15 01:01:03,400 [ 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 f80af158b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-15 01:01:09,976 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
