Console Output
+ export BASE_REPO=omero-build.git
+ BASE_REPO=omero-build.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-build-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-build-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-build-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-11-22 00:25:22,548 [ scc.config] DEBUG Found github.token
2024-11-22 00:25:22,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-22 00:25:22,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:25:23,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:25:23,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-22 00:25:23,504 [ scc.gh] DEBUG 4575 remaining from 5000 (Reset at 00:11
2024-11-22 00:25:23,505 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:23,509 [ scc.git] DEBUG Check current status
2024-11-22 00:25:23,509 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:23,513 [ scc.git] DEBUG 2439863 Merge pull request #209 from ome/dependabot/submodules/omero-model-73bac6e
2024-11-22 00:25:23,513 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:23,553 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2024-11-22 00:25:23,556 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2024-11-22 00:25:23,559 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2024-11-22 00:25:23,562 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2024-11-22 00:25:23,565 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-11-22 00:25:23,568 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2024-11-22 00:25:23,570 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-11-22 00:25:23,574 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:23,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-11-22 00:25:24,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:24,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:25,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:25,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:25,635 [ scc.git] DEBUG Resetting...
2024-11-22 00:25:25,635 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-22 00:25:25,642 [ scc.git] DEBUG HEAD is now at 2439863 Merge pull request #209 from ome/dependabot/submodules/omero-model-73bac6e
2024-11-22 00:25:25,642 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-22 00:25:25,698 [ scc.git] DEBUG Check current status
2024-11-22 00:25:25,699 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:25,703 [ scc.git] DEBUG 2439863 Merge pull request #209 from ome/dependabot/submodules/omero-model-73bac6e
2024-11-22 00:25:25,703 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:25,740 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2024-11-22 00:25:25,743 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2024-11-22 00:25:25,746 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2024-11-22 00:25:25,751 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2024-11-22 00:25:25,754 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-11-22 00:25:25,757 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2024-11-22 00:25:25,760 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-11-22 00:25:25,760 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-22 00:25:25,760 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-22 00:25:25,760 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-22 00:25:25,761 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-22 00:25:25,761 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-22 00:25:25,761 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:25:26,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-11-22 00:25:26,059 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:25:26,059 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:26,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:26,063 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:25:26,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:25:26,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:25:26,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:25:26,074 [ scc.git] DEBUG Already up to date.
2024-11-22 00:25:26,074 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:25:26,075 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:26,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:26,078 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:25:26,119 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:26,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:26,122 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:25:27,021 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff43a729f40> has no local changes
2024-11-22 00:25:27,022 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-build
Already up to date.
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:25:27,096 [ scc.git] DEBUG [detached HEAD 3caf100] merge master -Dorg -Snone
2024-11-22 00:25:27,096 [ scc.merge] INFO Repository: ome/omero-build
2024-11-22 00:25:27,096 [ scc.merge] INFO Already up to date.
2024-11-22 00:25:27,096 [ scc.merge] INFO
2024-11-22 00:25:27,096 [ scc.merge] INFO
2024-11-22 00:25:27,096 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-22 00:25:27,097 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-blitz'
Synchronizing submodule url for 'omero-common'
Synchronizing submodule url for 'omero-gateway-java'
Synchronizing submodule url for 'omero-model'
Synchronizing submodule url for 'omero-renderer'
Synchronizing submodule url for 'omero-romio'
Synchronizing submodule url for 'omero-server'
Submodule path 'omero-renderer': checked out '05383d47607d6657ed61c5fab099bacd5f5023b7'
Submodule path 'omero-server': checked out '5b5a78233c34e2ad99316686ad4272f520d7bb1c'
Merge all submodules2024-11-22 00:25:30,735 [ scc.config] DEBUG Found github.token
2024-11-22 00:25:30,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-22 00:25:30,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:25:31,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:25:31,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-22 00:25:31,699 [ scc.gh] DEBUG 4567 remaining from 5000 (Reset at 00:11
2024-11-22 00:25:31,700 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:31,704 [ scc.git] DEBUG Check current status
2024-11-22 00:25:31,704 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:31,709 [ scc.git] DEBUG 3caf100 merge master -Dorg -Snone
2024-11-22 00:25:31,709 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:31,753 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2024-11-22 00:25:31,756 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2024-11-22 00:25:31,759 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2024-11-22 00:25:31,763 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2024-11-22 00:25:31,766 [ scc.git] DEBUG +05383d47607d6657ed61c5fab099bacd5f5023b7 omero-renderer (v5.6.0-1-g05383d4)
2024-11-22 00:25:31,769 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2024-11-22 00:25:31,772 [ scc.git] DEBUG +5b5a78233c34e2ad99316686ad4272f520d7bb1c omero-server (v5.7.0-1-g5b5a7823)
2024-11-22 00:25:31,776 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:32,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-11-22 00:25:32,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:33,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:33,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:33,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:33,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:33,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-11-22 00:25:33,908 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:33,912 [ scc.git] DEBUG Check current status
2024-11-22 00:25:33,912 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:33,917 [ scc.git] DEBUG ffca80b8 Revert snapshot
2024-11-22 00:25:33,917 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:33,956 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:34,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2024-11-22 00:25:34,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:35,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:35,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:35,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:36,000 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:36,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:36,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-11-22 00:25:36,044 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:36,048 [ scc.git] DEBUG Check current status
2024-11-22 00:25:36,048 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:36,077 [ scc.git] DEBUG cc05596 Revert to snapshot
2024-11-22 00:25:36,077 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:36,119 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:36,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2024-11-22 00:25:36,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:37,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:37,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:38,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:38,165 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:38,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:38,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-11-22 00:25:38,205 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:38,208 [ scc.git] DEBUG Check current status
2024-11-22 00:25:38,209 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:38,272 [ scc.git] DEBUG dc3af36 Revert to snapshot
2024-11-22 00:25:38,272 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:38,314 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:38,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2024-11-22 00:25:39,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:39,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:39,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:40,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:40,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:40,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:40,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-11-22 00:25:40,374 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:40,378 [ scc.git] DEBUG Check current status
2024-11-22 00:25:40,378 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:40,441 [ scc.git] DEBUG 73bac6e Revert to snapshot
2024-11-22 00:25:40,441 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:40,486 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:40,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2024-11-22 00:25:41,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:41,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:42,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:42,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:42,501 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:42,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:42,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-11-22 00:25:42,541 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:42,545 [ scc.git] DEBUG Check current status
2024-11-22 00:25:42,545 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:42,549 [ scc.git] DEBUG 05383d4 Revert to snapshot
2024-11-22 00:25:42,549 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:42,588 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:43,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2024-11-22 00:25:43,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:43,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:44,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:44,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:44,676 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:44,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:44,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-11-22 00:25:44,717 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:44,721 [ scc.git] DEBUG Check current status
2024-11-22 00:25:44,721 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:44,726 [ scc.git] DEBUG 47a1380 Revert to snapshot
2024-11-22 00:25:44,726 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:44,768 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:45,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2024-11-22 00:25:45,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:46,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:46,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:46,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:46,828 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:46,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:46,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-11-22 00:25:46,871 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-22 00:25:46,875 [ scc.git] DEBUG Check current status
2024-11-22 00:25:46,876 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:46,880 [ scc.git] DEBUG 5b5a7823 Revert to snapshot
2024-11-22 00:25:46,880 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:46,925 [ scc.config] DEBUG Found remote.origin.url
2024-11-22 00:25:47,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2024-11-22 00:25:47,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-22 00:25:48,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-22 00:25:48,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-22 00:25:49,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-22 00:25:49,024 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:49,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:49,065 [ scc.git] DEBUG Resetting...
2024-11-22 00:25:49,065 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-22 00:25:49,072 [ scc.git] DEBUG HEAD is now at 3caf100 merge master -Dorg -Snone
2024-11-22 00:25:49,072 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-22 00:25:49,129 [ scc.git] DEBUG Submodule path 'omero-renderer': checked out '97fb4155049100b22bbc685b814326adc69f723e'
2024-11-22 00:25:49,146 [ scc.git] DEBUG Submodule path 'omero-server': checked out '8eb311d45642163b79463c38c4b06884a637923d'
2024-11-22 00:25:49,149 [ scc.git] DEBUG Check current status
2024-11-22 00:25:49,149 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-22 00:25:49,154 [ scc.git] DEBUG 3caf100 merge master -Dorg -Snone
2024-11-22 00:25:49,154 [ scc.git] DEBUG Calling 'git submodule status'
2024-11-22 00:25:49,191 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2024-11-22 00:25:49,194 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2024-11-22 00:25:49,197 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2024-11-22 00:25:49,200 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2024-11-22 00:25:49,203 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-11-22 00:25:49,206 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2024-11-22 00:25:49,208 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-11-22 00:25:49,209 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-11-22 00:25:49,209 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-11-22 00:25:49,209 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-11-22 00:25:49,210 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-11-22 00:25:49,210 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-11-22 00:25:49,210 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-11-22 00:25:49,210 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:25:49,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-11-22 00:25:49,434 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:25:49,434 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:49,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:49,439 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:25:49,442 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:25:49,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:25:49,446 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:25:49,450 [ scc.git] DEBUG Already up to date.
2024-11-22 00:25:49,450 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:25:49,450 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:49,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:49,454 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:25:49,491 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:49,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:49,495 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:25:49,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2024-11-22 00:25:50,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/153 HTTP/1.1" 200 None
2024-11-22 00:25:50,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2024-11-22 00:25:51,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2024-11-22 00:25:51,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-11-22 00:25:52,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-22 00:25:52,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-22 00:25:53,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-11-22 00:25:53,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/6d887b53b85d244eed855703effd0e470c83bab9?per_page=1 HTTP/1.1" 200 2
2024-11-22 00:25:53,671 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2024-11-22 00:25:54,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2024-11-22 00:25:54,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2024-11-22 00:25:55,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-11-22 00:25:55,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-22 00:25:56,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-11-22 00:25:56,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/4ef8809efaee231eb83e45e64a852a9808bc4723?per_page=1 HTTP/1.1" 200 2
2024-11-22 00:25:56,439 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-11-22 00:25:56,439 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:25:56,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-11-22 00:25:56,439 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:56,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:56,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:25:56,449 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:25:56,449 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:25:56,453 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:25:56,457 [ scc.git] DEBUG Already up to date.
2024-11-22 00:25:56,457 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2024-11-22 00:25:57,283 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-11-22 00:25:57,283 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2024-11-22 00:25:57,289 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2024-11-22 00:25:57,857 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-11-22 00:25:57,857 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2024-11-22 00:25:57,862 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:25:57,862 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:57,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:57,866 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-11-22 00:25:57,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:57,876 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 119 (Take Ice and omero sysenv variables into account) 4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-11-22 00:25:57,949 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2024-11-22 00:25:57,951 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-22 00:25:57,954 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2024-11-22 00:25:57,954 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-11-22 00:25:58,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:25:58,127 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9'
2024-11-22 00:25:58,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:58,139 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9'
2024-11-22 00:25:58,259 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-22 00:25:58,261 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2024-11-22 00:25:58,262 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-22 00:25:58,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:25:58,512 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:25:58,550 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:25:58,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:25:58,555 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:25:58,592 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:25:58,600 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442c3fcf70> has no local changes
2024-11-22 00:25:58,601 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-blitz
Excluded PRs:
- PR 153 dominikl 'Add isRGB method' (stage: draft)
Already up to date.
Merged PRs:
- PR 119 dominikl 'Take Ice and omero sysenv variables into account'
- PR 132 jburel 'Fix javadoc warning'
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:25:58,609 [ scc.git] DEBUG [detached HEAD d9c37746] merge master -Dorg -Ssuccess-only
2024-11-22 00:25:58,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:25:58,610 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:25:59,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2024-11-22 00:25:59,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/46 HTTP/1.1" 200 None
2024-11-22 00:26:00,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/45 HTTP/1.1" 200 None
2024-11-22 00:26:00,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/45/comments HTTP/1.1" 200 None
2024-11-22 00:26:00,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2024-11-22 00:26:01,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2024-11-22 00:26:01,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-11-22 00:26:02,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-22 00:26:02,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-11-22 00:26:03,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/92e4d3ee9bd655e531156415863a1defa7d0ab39?per_page=1 HTTP/1.1" 200 2
2024-11-22 00:26:03,283 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2024-11-22 00:26:03,284 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:26:03,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-11-22 00:26:03,284 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:03,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:03,289 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:26:03,293 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:26:03,294 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:26:03,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:26:03,304 [ scc.git] DEBUG Already up to date.
2024-11-22 00:26:03,305 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2024-11-22 00:26:04,073 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-11-22 00:26:04,073 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2024-11-22 00:26:04,078 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:26:04,079 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:04,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:04,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-11-22 00:26:04,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:04,092 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-11-22 00:26:04,102 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-22 00:26:04,104 [ scc.git] DEBUG publish.gradle | 17 +----------------
2024-11-22 00:26:04,104 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2024-11-22 00:26:04,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:04,240 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:26:04,278 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:04,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:04,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:04,317 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:04,323 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442c481ee0> has no local changes
2024-11-22 00:26:04,324 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-common
Excluded PRs:
- PR 46 dominikl 'Add isRGB method' (stage: draft)
- PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
- PR 40 jburel 'set classifier' (exclude comment)
- PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 42 jburel 'include all'
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:04,332 [ scc.git] DEBUG [detached HEAD 9616b1a] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:04,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:04,332 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:26:04,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2024-11-22 00:26:05,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/94 HTTP/1.1" 200 None
2024-11-22 00:26:05,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/93 HTTP/1.1" 200 None
2024-11-22 00:26:06,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/7883920555ca4261d7798b6612ac29770bc189d9 HTTP/1.1" 200 None
2024-11-22 00:26:06,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/7883920555ca4261d7798b6612ac29770bc189d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-22 00:26:07,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/7883920555ca4261d7798b6612ac29770bc189d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-22 00:26:07,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/7883920555ca4261d7798b6612ac29770bc189d9 HTTP/1.1" 200 None
2024-11-22 00:26:08,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/statuses/7883920555ca4261d7798b6612ac29770bc189d9?per_page=1 HTTP/1.1" 200 2
2024-11-22 00:26:08,003 [ scc.repo] DEBUG - PR 93 dominikl 'Renderfacility'
2024-11-22 00:26:08,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2024-11-22 00:26:09,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2024-11-22 00:26:09,102 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:26:09,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-11-22 00:26:09,102 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:09,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:09,107 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:26:09,111 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:26:09,111 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:26:09,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:26:09,120 [ scc.git] DEBUG Already up to date.
2024-11-22 00:26:09,120 [ scc.git] DEBUG Calling 'git fetch origin pull/93/head'
2024-11-22 00:26:09,693 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-11-22 00:26:09,693 [ scc.git] DEBUG * branch refs/pull/93/head -> FETCH_HEAD
2024-11-22 00:26:09,698 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:26:09,698 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:09,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:09,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7883920555ca4261d7798b6612ac29770bc189d9'
2024-11-22 00:26:09,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:09,711 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 93 (Renderfacility) 7883920555ca4261d7798b6612ac29770bc189d9'
2024-11-22 00:26:09,786 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-22 00:26:09,790 [ scc.git] DEBUG src/main/java/omero/gateway/Gateway.java | 9 +-
2024-11-22 00:26:09,790 [ scc.git] DEBUG src/main/java/omero/gateway/facility/Facility.java | 8 +-
2024-11-22 00:26:09,790 [ scc.git] DEBUG .../omero/gateway/facility/RenderFacility.java | 161 +++++++++++++++++++++
2024-11-22 00:26:09,790 [ scc.git] DEBUG 3 files changed, 174 insertions(+), 4 deletions(-)
2024-11-22 00:26:09,790 [ scc.git] DEBUG create mode 100644 src/main/java/omero/gateway/facility/RenderFacility.java
2024-11-22 00:26:09,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:09,926 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:26:09,964 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:09,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:09,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:10,010 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:10,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442b39efd0> has no local changes
2024-11-22 00:26:10,017 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gateway-java
Excluded PRs:
- PR 94 dominikl 'Add isRGB method' (stage: draft)
- PR 30 jburel 'Import image' (exclude comment)
Already up to date.
Merged PRs:
- PR 93 dominikl 'Renderfacility'
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:10,168 [ scc.git] DEBUG [detached HEAD cd6e3f2] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:10,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:10,169 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:26:10,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 2
2024-11-22 00:26:10,332 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:26:10,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-11-22 00:26:10,332 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:10,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:10,337 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:26:10,342 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:26:10,342 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:26:10,348 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:26:10,354 [ scc.git] DEBUG Already up to date.
2024-11-22 00:26:10,354 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:26:10,354 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:10,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:10,358 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:26:10,398 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:10,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:10,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:10,442 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:10,448 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442c3fcf40> has no local changes
2024-11-22 00:26:10,448 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-model
Already up to date.
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:10,455 [ scc.git] DEBUG [detached HEAD 08a8ad2] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:10,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:10,456 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:26:10,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2024-11-22 00:26:11,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2024-11-22 00:26:11,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2024-11-22 00:26:11,848 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-11-22 00:26:11,848 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:26:11,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-11-22 00:26:11,848 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:11,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:11,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:26:11,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:26:11,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:26:11,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:26:11,982 [ scc.git] DEBUG Updating 97fb415..05383d4
2024-11-22 00:26:12,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls/27 HTTP/1.1" 200 None
2024-11-22 00:26:12,496 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:26:12,496 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:12,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:12,500 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:26:12,537 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:12,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:12,541 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:12,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:12,581 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442a371af0> has no local changes
2024-11-22 00:26:12,582 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Updating 97fb415..05383d4
Previously merged:
- PR 27 jburel 'Build fix'
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:12,588 [ scc.git] DEBUG [detached HEAD 43e2ce0] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:12,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:12,589 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:26:12,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2024-11-22 00:26:13,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/43 HTTP/1.1" 200 None
2024-11-22 00:26:13,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2024-11-22 00:26:14,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2024-11-22 00:26:14,431 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:26:14,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-11-22 00:26:14,431 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:14,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:14,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:26:14,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:26:14,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:26:14,445 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:26:14,450 [ scc.git] DEBUG Already up to date.
2024-11-22 00:26:14,450 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:26:14,450 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:14,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:14,454 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:26:14,493 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:14,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:14,498 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:14,538 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:14,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442e8a5ac0> has no local changes
2024-11-22 00:26:14,544 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-romio
Excluded PRs:
- PR 43 dominikl 'Add isRGB methods' (stage: draft)
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:14,552 [ scc.git] DEBUG [detached HEAD 638b4a6] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:14,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:14,552 [ scc.repo] DEBUG ## PRs found:
2024-11-22 00:26:14,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2024-11-22 00:26:15,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/182 HTTP/1.1" 200 None
2024-11-22 00:26:15,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/182/comments HTTP/1.1" 200 None
2024-11-22 00:26:16,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2024-11-22 00:26:16,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2024-11-22 00:26:17,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2024-11-22 00:26:17,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2024-11-22 00:26:18,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-11-22 00:26:18,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-22 00:26:19,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-11-22 00:26:19,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/3e65b9de901fc160c380da602def943206fe9b1d?per_page=1 HTTP/1.1" 200 2
2024-11-22 00:26:19,597 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2024-11-22 00:26:20,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2024-11-22 00:26:20,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2024-11-22 00:26:21,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-11-22 00:26:21,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-22 00:26:22,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-11-22 00:26:22,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf?per_page=1 HTTP/1.1" 200 2
2024-11-22 00:26:22,480 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-11-22 00:26:22,481 [ scc.repo] DEBUG ## Branches found:
2024-11-22 00:26:22,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-11-22 00:26:22,481 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:22,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:22,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-22 00:26:22,490 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-22 00:26:22,490 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-22 00:26:22,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-22 00:26:22,544 [ scc.git] DEBUG Updating 8eb311d4..5b5a7823
2024-11-22 00:26:23,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls/184 HTTP/1.1" 200 None
2024-11-22 00:26:23,097 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2024-11-22 00:26:23,697 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-11-22 00:26:23,697 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2024-11-22 00:26:23,703 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2024-11-22 00:26:24,025 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-11-22 00:26:24,025 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2024-11-22 00:26:24,030 [ scc.git] DEBUG ## Unique users: []
2024-11-22 00:26:24,030 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:24,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:24,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-11-22 00:26:24,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:24,044 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 61 (Pass user executor to rendering tasks) 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-11-22 00:26:24,193 [ scc.git] DEBUG CONFLICT (modify/delete): .travis.yml deleted in HEAD and modified in 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf. Version 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf of .travis.yml left in tree.
2024-11-22 00:26:24,193 [ scc.git] DEBUG Auto-merging build.gradle
2024-11-22 00:26:24,193 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2024-11-22 00:26:24,194 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-22 00:26:24,194 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-22 00:26:24,201 [ scc.git] DEBUG Calling 'git reset --hard 5b5a78233c34e2ad99316686ad4272f520d7bb1c'
2024-11-22 00:26:24,209 [ scc.git] DEBUG HEAD is now at 5b5a7823 Revert to snapshot
2024-11-22 00:26:24,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:24,366 [ scc.git] DEBUG Calling 'git merge-base 5b5a78233c34e2ad99316686ad4272f520d7bb1c 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-11-22 00:26:24,373 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..5b5a78233c34e2ad99316686ad4272f520d7bb1c'
2024-11-22 00:26:24,378 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#250](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .travis.yml
- build.gradle
--conflicts
2024-11-22 00:26:24,382 [ scc.config] DEBUG Found github.token
2024-11-22 00:26:24,382 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2024-11-22 00:26:24,382 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2024-11-22 00:26:24,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:24,391 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2024-11-22 00:26:24,407 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-22 00:26:24,409 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2024-11-22 00:26:24,409 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-22 00:26:24,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:24,750 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-22 00:26:24,790 [ scc.git] DEBUG Get sha1 of %s
2024-11-22 00:26:24,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-22 00:26:24,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:24,834 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:24,844 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442a37a760> has no local changes
2024-11-22 00:26:24,844 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-server
Excluded PRs:
- PR 182 dominikl 'Add isRGB method' (stage: draft)
- PR 166 kkoz 'Experimenter group cache' (stage: draft)
- PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Updating 8eb311d4..5b5a7823
Previously merged:
- PR 184 jburel 'Build fix'
Merged PRs:
- PR 152 jburel 'Set class in doc'
Conflicting PRs (not included):
- PR 61 joshmoore 'Pass user executor to rendering tasks'
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:24,855 [ scc.git] DEBUG [detached HEAD d2e0d36a] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:24,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:24,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-22 00:26:24,907 [ scc.config] DEBUG Found submodule.omero-blitz.url
2024-11-22 00:26:25,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:25,149 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2024-11-22 00:26:25,153 [ scc.config] DEBUG Found submodule.omero-common.url
2024-11-22 00:26:25,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:25,532 [ scc.config] DEBUG Found submodule.omero-common.branch
2024-11-22 00:26:25,535 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2024-11-22 00:26:25,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:25,913 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2024-11-22 00:26:25,917 [ scc.config] DEBUG Found submodule.omero-model.url
2024-11-22 00:26:26,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:26,299 [ scc.config] DEBUG Found submodule.omero-model.branch
2024-11-22 00:26:26,303 [ scc.config] DEBUG Found submodule.omero-renderer.url
2024-11-22 00:26:26,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:26,688 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2024-11-22 00:26:26,692 [ scc.config] DEBUG Found submodule.omero-romio.url
2024-11-22 00:26:27,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:27,074 [ scc.config] DEBUG Found submodule.omero-romio.branch
2024-11-22 00:26:27,078 [ scc.config] DEBUG Found submodule.omero-server.url
2024-11-22 00:26:27,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-22 00:26:27,463 [ scc.config] DEBUG Found submodule.omero-server.branch
2024-11-22 00:26:27,463 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-22 00:26:27,499 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f442e76ff40> has local changes
2024-11-22 00:26:27,499 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-build
Already up to date.
Repository: ome/omero-blitz
Excluded PRs:
- PR 153 dominikl 'Add isRGB method' (stage: draft)
Already up to date.
Merged PRs:
- PR 119 dominikl 'Take Ice and omero sysenv variables into account'
- PR 132 jburel 'Fix javadoc warning'
Repository: ome/omero-common
Excluded PRs:
- PR 46 dominikl 'Add isRGB method' (stage: draft)
- PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
- PR 40 jburel 'set classifier' (exclude comment)
- PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 42 jburel 'include all'
Repository: ome/omero-gateway-java
Excluded PRs:
- PR 94 dominikl 'Add isRGB method' (stage: draft)
- PR 30 jburel 'Import image' (exclude comment)
Already up to date.
Merged PRs:
- PR 93 dominikl 'Renderfacility'
Repository: ome/omero-model
Already up to date.
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Updating 97fb415..05383d4
Previously merged:
- PR 27 jburel 'Build fix'
Repository: ome/omero-romio
Excluded PRs:
- PR 43 dominikl 'Add isRGB methods' (stage: draft)
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Repository: ome/omero-server
Excluded PRs:
- PR 182 dominikl 'Add isRGB method' (stage: draft)
- PR 166 kkoz 'Experimenter group cache' (stage: draft)
- PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Updating 8eb311d4..5b5a7823
Previously merged:
- PR 184 jburel 'Build fix'
Merged PRs:
- PR 152 jburel 'Set class in doc'
Conflicting PRs (not included):
- PR 61 joshmoore 'Pass user executor to rendering tasks'
Generated by OMERO-build-push#250 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/250/)'
2024-11-22 00:26:27,508 [ scc.git] DEBUG [detached HEAD 8032f15] merge master -Dorg -Ssuccess-only
2024-11-22 00:26:27,509 [ scc.merge] INFO Repository: ome/omero-build
2024-11-22 00:26:27,509 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2024-11-22 00:26:27,509 [ scc.merge] INFO Already up to date.
2024-11-22 00:26:27,509 [ scc.merge] INFO
2024-11-22 00:26:27,509 [ scc.merge] INFO
2024-11-22 00:26:27,509 [ scc.merge] INFO Repository: ome/omero-blitz
2024-11-22 00:26:27,509 [ scc.merge] INFO Excluded PRs:
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 153 dominikl 'Add isRGB method' (stage: draft)
2024-11-22 00:26:27,509 [ scc.merge] INFO Already up to date.
2024-11-22 00:26:27,509 [ scc.merge] INFO
2024-11-22 00:26:27,509 [ scc.merge] INFO Merged PRs:
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2024-11-22 00:26:27,509 [ scc.merge] INFO
2024-11-22 00:26:27,509 [ scc.merge] INFO Repository: ome/omero-common
2024-11-22 00:26:27,509 [ scc.merge] INFO Excluded PRs:
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 46 dominikl 'Add isRGB method' (stage: draft)
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2024-11-22 00:26:27,509 [ scc.merge] INFO Already up to date.
2024-11-22 00:26:27,509 [ scc.merge] INFO
2024-11-22 00:26:27,509 [ scc.merge] INFO Merged PRs:
2024-11-22 00:26:27,509 [ scc.merge] INFO - PR 42 jburel 'include all'
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO Repository: ome/omero-gateway-java
2024-11-22 00:26:27,510 [ scc.merge] INFO Excluded PRs:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 94 dominikl 'Add isRGB method' (stage: draft)
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2024-11-22 00:26:27,510 [ scc.merge] INFO Already up to date.
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO Merged PRs:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 93 dominikl 'Renderfacility'
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO Repository: ome/omero-model
2024-11-22 00:26:27,510 [ scc.merge] INFO Already up to date.
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO Repository: ome/omero-renderer
2024-11-22 00:26:27,510 [ scc.merge] INFO Excluded PRs:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2024-11-22 00:26:27,510 [ scc.merge] INFO Updating 97fb415..05383d4
2024-11-22 00:26:27,510 [ scc.merge] INFO Previously merged:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 27 jburel 'Build fix'
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO Repository: ome/omero-romio
2024-11-22 00:26:27,510 [ scc.merge] INFO Excluded PRs:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 43 dominikl 'Add isRGB methods' (stage: draft)
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2024-11-22 00:26:27,510 [ scc.merge] INFO Already up to date.
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO
2024-11-22 00:26:27,510 [ scc.merge] INFO Repository: ome/omero-server
2024-11-22 00:26:27,510 [ scc.merge] INFO Excluded PRs:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 182 dominikl 'Add isRGB method' (stage: draft)
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2024-11-22 00:26:27,510 [ scc.merge] INFO Updating 8eb311d4..5b5a7823
2024-11-22 00:26:27,510 [ scc.merge] INFO Previously merged:
2024-11-22 00:26:27,510 [ scc.merge] INFO - PR 184 jburel 'Build fix'
2024-11-22 00:26:27,511 [ scc.merge] INFO
2024-11-22 00:26:27,511 [ scc.merge] INFO Merged PRs:
2024-11-22 00:26:27,511 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2024-11-22 00:26:27,511 [ scc.merge] INFO
2024-11-22 00:26:27,511 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-22 00:26:27,511 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-11-22 00:26:27,511 [ scc.merge] INFO
2024-11-22 00:26:27,511 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-22 00:26:27,511 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-11-22 00:26:27,515 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:27,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-11-22 00:26:27,518 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:27,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-11-22 00:26:27,523 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:27,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-11-22 00:26:27,527 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:27,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-11-22 00:26:27,530 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:27,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-11-22 00:26:27,534 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-11-22 00:26:27,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-11-22 00:26:27,538 [ scc.git] DEBUG Calling 'git remote'
2024-11-22 00:26:27,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
Update component versions
Updating omero-common-test from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-server from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-model from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-blitz from 5.8.0 to 5.8.1-SNAPSHOT
Updating formats-gpl from 8.0.1 to 8.1.0-SNAPSHOT
Updating omero-romio from 5.8.0 to 5.8.1-SNAPSHOT
Updating omero-common from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-common-test from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-renderer from 5.6.0 to 5.6.1-SNAPSHOT
Commit all component version changes
Entering 'omero-blitz'
Entering 'omero-common'
Entering 'omero-gateway-java'
Entering 'omero-model'
Entering 'omero-renderer'
Entering 'omero-romio'
Entering 'omero-server'
Entering 'omero-blitz'
[detached HEAD 371346d5] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD 215a99f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD 899c36b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD 5fe151d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD 6cef42a] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD 9d64a5a] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD 730034da] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD 9620413] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2024-11-22 00:27:00,421 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-build/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
