Skipping 225 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-16 01:02:28,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:28,705 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-16 01:02:29,168 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-16 01:02:29,169 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-16 01:02:29,169 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:02:29,169 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:02:29,172 [ scc.git] DEBUG Calling 'git reset --hard 7515f035d5fab3432cb50f42f0022634348c32d1'
2025-04-16 01:02:29,180 [ scc.git] DEBUG HEAD is now at 7515f03 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-16 01:02:29,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:29,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:02:29,347 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-16 01:02:29,350 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-16 01:02:29,352 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-16 01:02:29,354 [ scc.config] DEBUG Found github.token
2025-04-16 01:02:29,354 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-16 01:02:29,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-16 01:02:29,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:29,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-16 01:02:29,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:02:29,383 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-16 01:02:29,383 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-16 01:02:29,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:29,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:02:29,754 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:02:29,793 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:29,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:29,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:02:29,832 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:02:29,839 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2449c0a510> has no local changes
2025-04-16 01:02:29,839 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:02:29,849 [ scc.git] DEBUG [detached HEAD 960c4d8] merge master -Dorg -Ssuccess-only
2025-04-16 01:02:29,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:02:29,849 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:02:30,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:30,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-16 01:02:30,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:30,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-16 01:02:31,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:31,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-16 01:02:31,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:31,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:32,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:32,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-16 01:02:32,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:32,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:32,741 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:02:32,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:33,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-16 01:02:33,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:33,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-16 01:02:34,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:34,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-16 01:02:34,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:34,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:35,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:35,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-16 01:02:35,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:35,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:35,755 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-16 01:02:35,756 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:02:35,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-16 01:02:35,756 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:35,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:35,759 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:02:35,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:02:35,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:02:35,764 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:02:35,767 [ scc.git] DEBUG Already up to date.
2025-04-16 01:02:35,767 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-16 01:02:36,695 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-16 01:02:36,695 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-16 01:02:36,699 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-16 01:02:37,002 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-16 01:02:37,002 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-16 01:02:37,006 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:02:37,006 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:37,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:37,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-16 01:02:37,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:37,014 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-16 01:02:37,224 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:02:37,227 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-16 01:02:37,227 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-16 01:02:37,227 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-16 01:02:37,227 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-16 01:02:37,227 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-16 01:02:37,227 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-16 01:02:37,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:37,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:02:37,403 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-16 01:02:37,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:37,410 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-16 01:02:37,419 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:02:37,421 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-16 01:02:37,421 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-16 01:02:37,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:37,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:02:37,827 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:02:37,865 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:37,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:37,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:02:37,905 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:02:37,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2449afb7d0> has no local changes
2025-04-16 01:02:37,909 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:02:37,915 [ scc.git] DEBUG [detached HEAD ad10854] merge master -Dorg -Ssuccess-only
2025-04-16 01:02:37,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:02:37,916 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:02:38,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:38,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-16 01:02:38,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:38,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-16 01:02:39,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:39,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-16 01:02:39,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:39,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-16 01:02:40,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:40,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:40,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:41,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-16 01:02:41,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:41,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:41,444 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-16 01:02:41,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:41,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-16 01:02:42,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:42,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-16 01:02:42,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:42,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-16 01:02:43,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:43,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:43,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:43,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-16 01:02:44,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:44,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:44,414 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-16 01:02:44,414 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:02:44,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-16 01:02:44,414 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:44,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:44,417 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:02:44,419 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:02:44,419 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:02:44,422 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:02:44,430 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-16 01:02:44,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:45,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-16 01:02:45,080 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-16 01:02:45,493 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-16 01:02:45,493 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-16 01:02:45,497 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-16 01:02:45,858 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-16 01:02:45,858 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-16 01:02:45,863 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:02:45,863 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:45,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:45,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-16 01:02:45,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:45,872 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-16 01:02:46,290 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-16 01:02:46,291 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-16 01:02:46,291 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-16 01:02:46,291 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-16 01:02:46,291 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:02:46,291 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:02:46,294 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-16 01:02:46,299 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-16 01:02:46,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:46,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:02:46,468 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-16 01:02:46,472 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-16 01:02:46,475 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-16 01:02:46,478 [ scc.config] DEBUG Found github.token
2025-04-16 01:02:46,478 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-16 01:02:46,478 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-16 01:02:46,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:46,484 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-16 01:02:46,515 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-16 01:02:46,516 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-16 01:02:46,516 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-16 01:02:46,516 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:02:46,516 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:02:46,519 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-16 01:02:46,524 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-16 01:02:46,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:46,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:02:46,892 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-16 01:02:46,897 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-16 01:02:46,900 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-04-16 01:02:46,901 [ scc.config] DEBUG Found github.token
2025-04-16 01:02:46,902 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-16 01:02:46,902 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:02:46,939 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:02:46,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:02:46,942 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:02:46,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:02:46,983 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244a6e1e10> has no local changes
2025-04-16 01:02:46,984 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:02:46,990 [ scc.git] DEBUG [detached HEAD 61af077] merge master -Dorg -Ssuccess-only
2025-04-16 01:02:46,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:02:46,991 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:02:47,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:47,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-16 01:02:47,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:47,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-16 01:02:48,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:48,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-16 01:02:48,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:49,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:49,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:49,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:02:49,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:50,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-16 01:02:50,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:50,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:50,491 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:02:50,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:50,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-16 01:02:50,973 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-16 01:02:51,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:51,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-16 01:02:51,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:52,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:52,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:52,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:02:52,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:53,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-16 01:02:53,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:53,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:53,603 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-16 01:02:53,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:54,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-16 01:02:54,130 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-16 01:02:54,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:54,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-16 01:02:54,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:55,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:02:55,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:55,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:02:55,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:56,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-16 01:02:56,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:56,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:02:56,724 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-16 01:02:56,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:57,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-16 01:02:57,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:57,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-16 01:02:57,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:58,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-16 01:02:58,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:58,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-16 01:02:58,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:59,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-16 01:02:59,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:02:59,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-16 01:02:59,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:00,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-16 01:03:00,168 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:00,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-16 01:03:00,169 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:00,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:00,171 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:00,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:00,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:00,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:00,180 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:00,180 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-16 01:03:00,472 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-16 01:03:00,472 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-16 01:03:00,476 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-16 01:03:00,788 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-16 01:03:00,789 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-16 01:03:00,793 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-16 01:03:01,085 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-16 01:03:01,085 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-16 01:03:01,089 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:01,090 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:01,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:01,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-16 01:03:01,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:01,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-16 01:03:01,279 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:03:01,283 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-16 01:03:01,283 [ scc.git] DEBUG package.json | 2 +-
2025-04-16 01:03:01,283 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-16 01:03:01,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:01,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:01,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-16 01:03:01,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:01,526 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-16 01:03:01,628 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-16 01:03:01,628 [ scc.git] DEBUG Auto-merging package.json
2025-04-16 01:03:01,629 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:03:01,632 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-16 01:03:01,632 [ scc.git] DEBUG package.json | 2 +-
2025-04-16 01:03:01,632 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-16 01:03:01,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:01,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:01,889 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-16 01:03:01,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:01,894 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-16 01:03:01,903 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:03:01,905 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-16 01:03:01,905 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-16 01:03:02,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:02,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:02,298 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:02,336 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:02,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:02,338 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:02,376 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:02,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2448126890> has no local changes
2025-04-16 01:03:02,380 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:02,387 [ scc.git] DEBUG [detached HEAD 70d0fcf] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:02,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:02,387 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:02,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:02,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-16 01:03:02,744 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:02,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-16 01:03:02,744 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:02,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:02,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:02,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:02,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:02,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:02,755 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:02,755 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:02,755 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:02,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:02,757 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:02,794 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:02,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:02,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:02,834 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:02,837 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2449d11b90> has no local changes
2025-04-16 01:03:02,837 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:02,843 [ scc.git] DEBUG [detached HEAD c4c72f9] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:02,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:02,843 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:02,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:03,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-16 01:03:03,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:03,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-16 01:03:04,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:04,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-16 01:03:04,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:04,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-16 01:03:04,753 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:04,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-16 01:03:04,753 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:04,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:04,755 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:04,758 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:04,758 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:04,761 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:04,764 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:04,764 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:04,764 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:04,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:04,766 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:04,804 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:04,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:04,807 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:04,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:04,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2449b27490> has no local changes
2025-04-16 01:03:04,846 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:04,852 [ scc.git] DEBUG [detached HEAD bc0e140] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:04,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:04,853 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:05,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:05,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-16 01:03:05,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:05,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-16 01:03:06,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:06,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-16 01:03:06,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:06,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-16 01:03:07,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:07,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:07,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:07,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-16 01:03:08,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:08,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:08,698 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-16 01:03:08,698 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:08,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-16 01:03:08,698 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:08,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:08,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:08,703 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:08,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:08,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:08,710 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:08,710 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-16 01:03:09,252 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-16 01:03:09,252 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-16 01:03:09,256 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:09,256 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:09,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:09,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-16 01:03:09,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:09,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-16 01:03:09,471 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG Auto-merging setup.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-16 01:03:09,471 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:03:09,472 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:03:09,474 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-16 01:03:09,478 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-16 01:03:09,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:09,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:09,645 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-16 01:03:09,649 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-16 01:03:09,652 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-04-16 01:03:09,654 [ scc.config] DEBUG Found github.token
2025-04-16 01:03:09,654 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-16 01:03:09,654 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:09,692 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:09,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:09,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:09,732 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:09,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244814a510> has no local changes
2025-04-16 01:03:09,735 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:09,742 [ scc.git] DEBUG [detached HEAD 8d38dc4] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:09,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:09,742 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:09,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:10,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-16 01:03:10,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:10,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-16 01:03:11,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:11,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-16 01:03:11,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:11,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-16 01:03:12,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:12,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:12,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:12,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:03:13,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:13,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-16 01:03:13,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:13,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-16 01:03:14,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:14,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-16 01:03:14,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:14,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-16 01:03:14,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:15,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-16 01:03:15,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:15,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:16,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:16,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-16 01:03:16,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:16,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:16,698 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-16 01:03:16,699 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:16,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-16 01:03:16,699 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:16,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:16,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:16,704 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:16,704 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:16,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:16,710 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:16,710 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-16 01:03:17,111 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-16 01:03:17,111 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-16 01:03:17,115 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:17,115 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:17,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:17,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-16 01:03:17,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:17,123 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-04-16 01:03:17,135 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:03:17,138 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-16 01:03:17,139 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-16 01:03:17,139 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-16 01:03:17,139 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-16 01:03:17,139 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-16 01:03:17,139 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-16 01:03:17,139 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-16 01:03:17,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-16 01:03:17,140 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-16 01:03:17,140 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-16 01:03:17,140 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-16 01:03:17,141 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-16 01:03:17,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:17,310 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:17,349 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:17,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:17,351 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:17,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:17,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244b7c9b50> has no local changes
2025-04-16 01:03:17,393 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:17,400 [ scc.git] DEBUG [detached HEAD e60357e] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:17,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:17,401 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:17,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:17,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-16 01:03:17,727 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:17,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-16 01:03:17,727 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:17,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:17,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:17,732 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:17,732 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:17,735 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:17,738 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:17,738 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:17,738 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:17,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:17,740 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:17,778 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:17,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:17,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:17,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:17,820 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244816bf50> has no local changes
2025-04-16 01:03:17,820 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:17,826 [ scc.git] DEBUG [detached HEAD 98ce3f2] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:17,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:17,827 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:17,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:18,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-16 01:03:18,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:18,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-16 01:03:18,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:19,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-16 01:03:19,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:19,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-16 01:03:20,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:20,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:20,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:20,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:03:20,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:21,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-16 01:03:21,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:21,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:21,612 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-16 01:03:21,612 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:21,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-16 01:03:21,612 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:21,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:21,615 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:21,617 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:21,617 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:21,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:21,623 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:21,623 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-16 01:03:22,293 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-16 01:03:22,293 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-16 01:03:22,297 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:22,297 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:22,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:22,300 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-16 01:03:22,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:22,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-16 01:03:22,312 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:03:22,315 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-16 01:03:22,315 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-16 01:03:22,315 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-16 01:03:22,315 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-16 01:03:22,315 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-16 01:03:22,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:22,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:22,503 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:22,542 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:22,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:22,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:22,582 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:22,585 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244816f890> has no local changes
2025-04-16 01:03:22,585 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:22,592 [ scc.git] DEBUG [detached HEAD 19a38ad] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:22,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:22,592 [ scc.git] INFO Overriding base-branch from master to main
2025-04-16 01:03:22,592 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:22,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:23,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-16 01:03:23,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:23,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-16 01:03:23,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:24,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-16 01:03:24,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:24,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-16 01:03:24,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:25,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:25,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:25,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:03:25,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:26,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-16 01:03:26,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:26,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-16 01:03:26,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:26,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-16 01:03:27,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:27,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-16 01:03:27,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:28,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:28,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:28,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-16 01:03:28,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:29,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:29,004 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-16 01:03:29,004 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:29,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-16 01:03:29,004 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:29,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:29,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-16 01:03:29,009 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:29,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-16 01:03:29,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-16 01:03:29,015 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:29,015 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-16 01:03:29,483 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-16 01:03:29,483 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-16 01:03:29,487 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:29,487 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:29,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:29,489 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-16 01:03:29,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:29,494 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-16 01:03:29,668 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-16 01:03:29,668 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-16 01:03:29,668 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:03:29,668 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:03:29,671 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-16 01:03:29,675 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-16 01:03:29,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:29,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:29,847 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-16 01:03:29,849 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-16 01:03:29,852 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-16 01:03:29,854 [ scc.config] DEBUG Found github.token
2025-04-16 01:03:29,854 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-16 01:03:29,854 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:29,893 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:29,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:29,895 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:29,932 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:29,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244816a010> has no local changes
2025-04-16 01:03:29,935 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:29,942 [ scc.git] DEBUG [detached HEAD 830b61d] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:29,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:29,942 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:30,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:30,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-16 01:03:30,299 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:30,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-16 01:03:30,299 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:30,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:30,302 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:30,304 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:30,304 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:30,307 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:30,310 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:30,310 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:30,310 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:30,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:30,312 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:30,349 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:30,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:30,351 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:30,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:30,391 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f24481b0d90> has no local changes
2025-04-16 01:03:30,391 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:30,397 [ scc.git] DEBUG [detached HEAD 5e801ba] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:30,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:30,398 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:30,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:30,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-16 01:03:30,762 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:30,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-16 01:03:30,762 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:30,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:30,765 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:30,767 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:30,767 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:30,770 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:30,773 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:30,773 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:30,773 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:30,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:30,775 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:30,812 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:30,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:30,815 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:30,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:30,856 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2448194050> has no local changes
2025-04-16 01:03:30,856 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:30,862 [ scc.git] DEBUG [detached HEAD 12ceaf7] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:30,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:30,863 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:31,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:31,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-16 01:03:31,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:31,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-16 01:03:32,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:32,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-16 01:03:32,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:32,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-16 01:03:33,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:33,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:33,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:33,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-16 01:03:34,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:34,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:34,290 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-16 01:03:34,290 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:34,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-16 01:03:34,290 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:34,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:34,293 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-16 01:03:34,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:34,295 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-16 01:03:34,298 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-16 01:03:34,301 [ scc.git] DEBUG Already up to date.
2025-04-16 01:03:34,301 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-16 01:03:34,713 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-16 01:03:34,713 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-16 01:03:34,717 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:34,717 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:34,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:34,719 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-16 01:03:34,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:34,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-16 01:03:34,756 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-16 01:03:34,756 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-16 01:03:34,756 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:03:34,757 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:03:34,759 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-16 01:03:34,764 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-16 01:03:34,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:34,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:34,919 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-16 01:03:34,922 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-16 01:03:34,924 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-16 01:03:34,926 [ scc.config] DEBUG Found github.token
2025-04-16 01:03:34,926 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-16 01:03:34,926 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:34,966 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:34,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:34,968 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:35,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:35,009 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2449d13950> has no local changes
2025-04-16 01:03:35,009 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:35,015 [ scc.git] DEBUG [detached HEAD 2e6c2b6] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:35,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:35,016 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-16 01:03:35,016 [ scc.repo] DEBUG ## PRs found:
2025-04-16 01:03:35,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:35,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-16 01:03:35,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:36,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-16 01:03:36,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:36,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-16 01:03:36,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:36,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-16 01:03:37,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:37,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:37,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:37,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-16 01:03:38,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:38,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-16 01:03:38,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:38,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:38,877 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-16 01:03:39,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:39,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-16 01:03:39,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:39,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-16 01:03:40,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:40,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-16 01:03:40,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:40,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-16 01:03:41,039 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:41,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-16 01:03:41,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:41,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-16 01:03:41,662 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-16 01:03:41,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:42,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-16 01:03:42,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:42,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-16 01:03:43,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:43,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-16 01:03:43,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:43,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-16 01:03:43,764 [ scc.repo] DEBUG ## Branches found:
2025-04-16 01:03:43,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-16 01:03:43,764 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:43,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:43,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-16 01:03:43,769 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-16 01:03:43,769 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-16 01:03:43,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-16 01:03:43,780 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-16 01:03:44,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:44,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-16 01:03:44,419 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-16 01:03:44,911 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-16 01:03:44,911 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-16 01:03:44,915 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-16 01:03:45,227 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-16 01:03:45,228 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-16 01:03:45,231 [ scc.git] DEBUG ## Unique users: []
2025-04-16 01:03:45,232 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:45,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:45,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-16 01:03:45,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:45,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-16 01:03:45,306 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-16 01:03:45,306 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-16 01:03:45,307 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-16 01:03:45,309 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-16 01:03:45,313 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-16 01:03:45,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:45,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:45,505 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-16 01:03:45,510 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-16 01:03:45,514 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#390](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-16 01:03:45,516 [ scc.config] DEBUG Found github.token
2025-04-16 01:03:45,516 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-16 01:03:45,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-16 01:03:45,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:45,522 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-16 01:03:45,532 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-16 01:03:45,535 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-16 01:03:45,535 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-16 01:03:45,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:45,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:45,920 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-16 01:03:45,960 [ scc.git] DEBUG Get sha1 of %s
2025-04-16 01:03:45,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-16 01:03:45,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:46,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:46,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f244c10b9d0> has no local changes
2025-04-16 01:03:46,004 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:46,010 [ scc.git] DEBUG [detached HEAD 03a638f] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:46,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:46,011 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-16 01:03:46,084 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-16 01:03:46,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:46,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:46,359 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-16 01:03:46,361 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-16 01:03:46,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:46,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:46,768 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-16 01:03:46,770 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-16 01:03:47,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:47,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:47,183 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-16 01:03:47,185 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-16 01:03:47,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:47,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:47,608 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-16 01:03:47,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:48,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:48,036 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-16 01:03:48,037 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-16 01:03:48,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:48,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:48,445 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-16 01:03:48,448 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-16 01:03:48,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:48,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:48,876 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-16 01:03:48,878 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-16 01:03:49,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:49,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:49,301 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-16 01:03:49,303 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-16 01:03:49,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:49,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:49,712 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-16 01:03:49,714 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-16 01:03:49,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:50,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:50,122 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-16 01:03:50,124 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-16 01:03:50,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:50,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:50,556 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-16 01:03:50,558 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-16 01:03:50,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:50,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:50,970 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-16 01:03:50,972 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-16 01:03:51,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:51,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:51,409 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-16 01:03:51,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:51,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:51,823 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-16 01:03:52,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:52,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:52,227 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-16 01:03:52,229 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-16 01:03:52,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:52,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:52,649 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-16 01:03:52,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:53,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:53,081 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-16 01:03:53,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:53,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:53,502 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-16 01:03:53,504 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-16 01:03:53,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:53,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:53,922 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-16 01:03:53,923 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-16 01:03:54,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:54,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:54,331 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-16 01:03:54,333 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-16 01:03:54,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:54,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:54,744 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-16 01:03:54,746 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-16 01:03:54,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-16 01:03:55,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-16 01:03:55,184 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-16 01:03:55,184 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-16 01:03:55,276 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2449a33410> has local changes
2025-04-16 01:03:55,276 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#390 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/390/)'
2025-04-16 01:03:55,289 [ scc.git] DEBUG [detached HEAD 2f6fced] merge master -Dorg -Ssuccess-only
2025-04-16 01:03:55,290 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-16 01:03:55,290 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-16 01:03:55,290 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,290 [ scc.merge] INFO
2025-04-16 01:03:55,290 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,290 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-16 01:03:55,290 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-16 01:03:55,290 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-16 01:03:55,290 [ scc.merge] INFO
2025-04-16 01:03:55,290 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-16 01:03:55,290 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,290 [ scc.merge] INFO
2025-04-16 01:03:55,290 [ scc.merge] INFO
2025-04-16 01:03:55,290 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-16 01:03:55,290 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,290 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-16 01:03:55,290 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,290 [ scc.merge] INFO
2025-04-16 01:03:55,290 [ scc.merge] INFO
2025-04-16 01:03:55,290 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-16 01:03:55,290 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,290 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-16 01:03:55,290 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-16 01:03:55,291 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,291 [ scc.merge] INFO
2025-04-16 01:03:55,291 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-16 01:03:55,291 [ scc.merge] INFO
2025-04-16 01:03:55,291 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-16 01:03:55,291 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-16 01:03:55,291 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-16 01:03:55,291 [ scc.merge] INFO Previously merged:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:03:55,291 [ scc.merge] INFO
2025-04-16 01:03:55,291 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-16 01:03:55,291 [ scc.merge] INFO
2025-04-16 01:03:55,291 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-16 01:03:55,291 [ scc.merge] INFO
2025-04-16 01:03:55,291 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-16 01:03:55,291 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-16 01:03:55,291 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-16 01:03:55,291 [ scc.merge] INFO Previously merged:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:03:55,291 [ scc.merge] INFO
2025-04-16 01:03:55,291 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-16 01:03:55,291 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-16 01:03:55,292 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-16 01:03:55,292 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-16 01:03:55,292 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-16 01:03:55,292 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,292 [ scc.merge] INFO
2025-04-16 01:03:55,292 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-16 01:03:55,292 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-16 01:03:55,293 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-16 01:03:55,293 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-16 01:03:55,293 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-16 01:03:55,293 [ scc.merge] INFO Previously merged:
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-16 01:03:55,293 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-16 01:03:55,293 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-16 01:03:55,293 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-16 01:03:55,293 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO
2025-04-16 01:03:55,293 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-16 01:03:55,294 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-16 01:03:55,294 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-16 01:03:55,294 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-16 01:03:55,294 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-16 01:03:55,294 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-16 01:03:55,294 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-16 01:03:55,294 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-16 01:03:55,294 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-16 01:03:55,294 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,294 [ scc.merge] INFO
2025-04-16 01:03:55,294 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,294 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-16 01:03:55,295 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-16 01:03:55,295 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-16 01:03:55,295 [ scc.merge] INFO Already up to date.
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,295 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Repository: ome/scripts
2025-04-16 01:03:55,295 [ scc.merge] INFO Excluded PRs:
2025-04-16 01:03:55,295 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-16 01:03:55,295 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-16 01:03:55,295 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-16 01:03:55,295 [ scc.merge] INFO Previously merged:
2025-04-16 01:03:55,295 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Merged PRs:
2025-04-16 01:03:55,295 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-16 01:03:55,295 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-16 01:03:55,295 [ scc.merge] INFO
2025-04-16 01:03:55,295 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-16 01:03:55,295 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-16 01:03:55,297 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-16 01:03:55,300 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-16 01:03:55,302 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-16 01:03:55,304 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-16 01:03:55,306 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-16 01:03:55,309 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-16 01:03:55,311 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-16 01:03:55,313 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-16 01:03:55,315 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-16 01:03:55,317 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-16 01:03:55,319 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-16 01:03:55,322 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-16 01:03:55,324 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-16 01:03:55,326 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-16 01:03:55,328 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-16 01:03:55,330 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-16 01:03:55,332 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-16 01:03:55,334 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-16 01:03:55,336 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-16 01:03:55,338 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-16 01:03:55,341 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-16 01:03:55,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-16 01:03:55,343 [ scc.git] DEBUG Calling 'git remote'
2025-04-16 01:03:55,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 85991bf] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD a006bf7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-16 01:04:43,607 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-04-16 01:04:53,151 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-04-16 01:04:55,694 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-16 01:05:00,537 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-16 01:05:40,811 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
