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-30 00:59:33,055 [ scc.config] DEBUG Found github.token
2024-05-30 00:59:33,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-30 00:59:33,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:33,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:34,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-30 00:59:34,067 [ scc.gh] DEBUG 4994 remaining from 5000 (Reset at 01:05
2024-05-30 00:59:34,068 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-30 00:59:34,072 [ scc.git] DEBUG Check current status
2024-05-30 00:59:34,072 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-30 00:59:34,076 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-30 00:59:34,076 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-30 00:59:34,121 [ scc.config] DEBUG Found remote.origin.url
2024-05-30 00:59:34,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-30 00:59:35,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-30 00:59:35,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-30 00:59:35,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-30 00:59:36,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-30 00:59:36,339 [ scc.git] DEBUG Resetting...
2024-05-30 00:59:36,339 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-30 00:59:36,358 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-30 00:59:36,359 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-30 00:59:36,402 [ scc.git] DEBUG Check current status
2024-05-30 00:59:36,402 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-30 00:59:36,409 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-30 00:59:36,410 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-30 00:59:36,465 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-30 00:59:36,465 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-30 00:59:36,465 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-30 00:59:36,465 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-30 00:59:36,465 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-30 00:59:36,466 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:59:36,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-30 00:59:37,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-30 00:59:37,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-30 00:59:38,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-30 00:59:38,348 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-30 00:59:38,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-30 00:59:39,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-30 00:59:39,268 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-30 00:59:39,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-30 00:59:40,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-30 00:59:40,212 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-30 00:59:40,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-30 00:59:41,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-30 00:59:41,218 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:59:41,218 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:59:41,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:59:41,223 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:59:41,228 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:59:41,228 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:59:41,233 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:59:41,239 [ scc.git] DEBUG Already up to date.
2024-05-30 00:59:41,239 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-30 00:59:41,625 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-30 00:59:41,625 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-30 00:59:41,630 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-30 00:59:42,084 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-30 00:59:42,084 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-30 00:59:42,090 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-30 00:59:42,461 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-30 00:59:42,461 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-30 00:59:42,467 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:59:42,467 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:59:42,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:59:42,473 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-30 00:59:42,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:59:42,484 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-30 00:59:42,505 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-30 00:59:42,508 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:59:42,511 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-05-30 00:59:42,511 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-05-30 00:59:42,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:42,689 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-30 00:59:42,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:59:42,701 [ 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-30 00:59:42,741 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:59:42,744 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-05-30 00:59:42,745 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-05-30 00:59:43,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:43,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-30 00:59:43,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:59:43,130 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-30 00:59:43,157 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-30 00:59:43,160 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:59:43,162 [ scc.git] DEBUG build.gradle | 3 ++-
2024-05-30 00:59:43,163 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-05-30 00:59:43,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:43,522 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:59:43,561 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:59:43,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:59:43,565 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:59:43,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04c5ddf490> has no local changes
2024-05-30 00:59:43,613 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/75/)'
2024-05-30 00:59:43,627 [ scc.git] DEBUG [detached HEAD 0a7d945ca] merge master -Dorg -Snone
2024-05-30 00:59:43,627 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-30 00:59:43,627 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:59:43,627 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-30 00:59:43,627 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-30 00:59:43,627 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-30 00:59:43,627 [ scc.merge] INFO Already up to date.
2024-05-30 00:59:43,627 [ scc.merge] INFO
2024-05-30 00:59:43,627 [ scc.merge] INFO Merged PRs:
2024-05-30 00:59:43,627 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-30 00:59:43,627 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-30 00:59:43,627 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-30 00:59:43,627 [ scc.merge] INFO
2024-05-30 00:59:43,627 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-30 00:59:43,627 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-05-30 00:59:44,133 [ scc.config] DEBUG Found github.token
2024-05-30 00:59:44,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-30 00:59:44,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:44,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:59:45,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-30 00:59:45,169 [ scc.gh] DEBUG 4950 remaining from 5000 (Reset at 01:05
2024-05-30 00:59:45,170 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-30 00:59:45,174 [ scc.git] DEBUG Check current status
2024-05-30 00:59:45,175 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-30 00:59:45,178 [ scc.git] DEBUG 0a7d945ca merge master -Dorg -Snone
2024-05-30 00:59:45,179 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-30 00:59:45,219 [ scc.config] DEBUG Found remote.origin.url
2024-05-30 00:59:45,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-30 00:59:46,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-30 00:59:46,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-30 00:59:46,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-30 00:59:47,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-30 00:59:47,401 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:59:47,443 [ scc.git] DEBUG Resetting...
2024-05-30 00:59:47,443 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-30 00:59:47,461 [ scc.git] DEBUG HEAD is now at 0a7d945ca merge master -Dorg -Snone
2024-05-30 00:59:47,462 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-30 00:59:47,504 [ scc.git] DEBUG Check current status
2024-05-30 00:59:47,504 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-30 00:59:47,510 [ scc.git] DEBUG 0a7d945ca merge master -Dorg -Snone
2024-05-30 00:59:47,510 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-30 00:59:47,550 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-30 00:59:47,550 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-30 00:59:47,550 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-30 00:59:47,550 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-30 00:59:47,550 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-30 00:59:47,550 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-30 00:59:47,550 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:59:47,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-30 00:59:48,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-30 00:59:48,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-30 00:59:49,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-30 00:59:49,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-30 00:59:50,418 [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-30 00:59:50,921 [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-30 00:59:51,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-30 00:59:51,785 [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-30 00:59:52,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-30 00:59:52,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-05-30 00:59:52,727 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-30 00:59:53,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-30 00:59:53,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-30 00:59:54,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-30 00:59:54,709 [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-30 00:59:55,159 [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-30 00:59:55,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-30 00:59:56,093 [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-30 00:59:56,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-30 00:59:56,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-05-30 00:59:56,992 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-30 00:59:57,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-30 00:59:57,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-30 00:59:58,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-30 00:59:58,910 [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-30 00:59:59,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-30 00:59:59,824 [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-30 00:59:59,825 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-30 01:00:00,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-30 01:00:00,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-30 01:00:00,920 [ scc.repo] DEBUG ## Branches found:
2024-05-30 01:00:00,920 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 01:00:00,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 01:00:00,925 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 01:00:00,929 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 01:00:00,930 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 01:00:00,935 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 01:00:00,942 [ scc.git] DEBUG Already up to date.
2024-05-30 01:00:00,942 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-30 01:00:01,327 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-30 01:00:01,328 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-30 01:00:01,333 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-30 01:00:01,714 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-30 01:00:01,714 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-30 01:00:01,719 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-30 01:00:02,096 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-30 01:00:02,096 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-30 01:00:02,101 [ scc.git] DEBUG ## Unique users: []
2024-05-30 01:00:02,101 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 01:00:02,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 01:00:02,105 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-30 01:00:02,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 01:00:02,115 [ 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-30 01:00:02,121 [ scc.git] DEBUG Already up to date.
2024-05-30 01:00:02,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 01:00:02,288 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-30 01:00:02,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 01:00:02,299 [ 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-30 01:00:02,304 [ scc.git] DEBUG Already up to date.
2024-05-30 01:00:02,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 01:00:02,715 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-30 01:00:02,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 01:00:02,727 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-30 01:00:02,733 [ scc.git] DEBUG Already up to date.
2024-05-30 01:00:03,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 01:00:03,140 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 01:00:03,182 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 01:00:03,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 01:00:03,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 01:00:03,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 01:00:03,238 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efe47b0a850> has no local changes
2024-05-30 01:00:03,239 [ 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#75 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/75/)'
2024-05-30 01:00:03,253 [ scc.git] DEBUG [detached HEAD 4cbb3a764] merge master -Dorg -Ssuccess-only
2024-05-30 01:00:03,253 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-30 01:00:03,253 [ scc.merge] INFO Excluded PRs:
2024-05-30 01:00:03,253 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-30 01:00:03,253 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-30 01:00:03,254 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-30 01:00:03,254 [ scc.merge] INFO Already up to date.
2024-05-30 01:00:03,254 [ scc.merge] INFO
2024-05-30 01:00:03,254 [ scc.merge] INFO Merged PRs:
2024-05-30 01:00:03,254 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-30 01:00:03,254 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-30 01:00:03,254 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-30 01:00:03,254 [ scc.merge] INFO
2024-05-30 01:00:03,254 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-30 01:00:03,254 [ 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 5e1795b58] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-30 01:00:10,109 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
