Skipping 224 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-27 00:44:12,479 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:12,484 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6efe610> has no local changes
2025-04-27 00:44:12,484 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:12,491 [ scc.git] DEBUG [detached HEAD c3d98eb] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:12,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:12,491 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:12,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:12,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-27 00:44:13,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:13,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-27 00:44:13,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:13,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-27 00:44:14,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:14,427 [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-27 00:44:14,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:14,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-27 00:44:15,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:15,365 [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-27 00:44:15,366 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:44:15,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:15,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-27 00:44:16,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:16,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-27 00:44:16,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:16,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-27 00:44:17,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:17,398 [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-27 00:44:17,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:17,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-27 00:44:18,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:18,310 [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-27 00:44:18,311 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-27 00:44:18,311 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:18,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-27 00:44:18,311 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:18,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:18,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:18,317 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:18,317 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:18,320 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:18,323 [ scc.git] DEBUG Already up to date.
2025-04-27 00:44:18,323 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-27 00:44:18,598 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-27 00:44:18,598 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-27 00:44:18,602 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-27 00:44:18,873 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-27 00:44:18,873 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-27 00:44:18,877 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:18,878 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:18,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:18,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-27 00:44:18,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:18,886 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-27 00:44:18,895 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:18,898 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-27 00:44:18,899 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-27 00:44:18,899 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-27 00:44:18,899 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-27 00:44:18,899 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-27 00:44:18,899 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-27 00:44:18,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:19,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:19,054 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-27 00:44:19,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:19,060 [ 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-27 00:44:19,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:19,072 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-27 00:44:19,072 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-27 00:44:19,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:19,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:19,471 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:44:19,511 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:19,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:19,513 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:44:19,549 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:19,553 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6e07350> has no local changes
2025-04-27 00:44:19,553 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:19,560 [ scc.git] DEBUG [detached HEAD 23bdcfe] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:19,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:19,560 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:19,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:20,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-27 00:44:20,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:20,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-27 00:44:20,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:21,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-27 00:44:21,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:21,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-27 00:44:21,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:22,062 [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-27 00:44:22,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:22,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-27 00:44:22,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:23,037 [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-27 00:44:23,037 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-27 00:44:23,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:23,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-27 00:44:23,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:24,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-27 00:44:24,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:24,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-27 00:44:24,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:25,029 [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-27 00:44:25,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:25,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-27 00:44:25,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:25,893 [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-27 00:44:25,893 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-27 00:44:25,894 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:25,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-27 00:44:25,894 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:25,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:25,896 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:25,899 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:25,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:25,902 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:25,909 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-27 00:44:26,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:26,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-27 00:44:26,596 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-27 00:44:26,871 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-27 00:44:26,871 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-27 00:44:26,875 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-27 00:44:27,171 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-27 00:44:27,172 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-27 00:44:27,176 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:27,176 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:27,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:27,179 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-27 00:44:27,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:27,186 [ 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-27 00:44:27,199 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-27 00:44:27,199 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-27 00:44:27,199 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-27 00:44:27,199 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-27 00:44:27,199 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-27 00:44:27,200 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-27 00:44:27,202 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-27 00:44:27,207 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-27 00:44:27,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:27,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:27,373 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-27 00:44:27,377 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-27 00:44:27,380 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#401](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-27 00:44:27,382 [ scc.config] DEBUG Found github.token
2025-04-27 00:44:27,383 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-27 00:44:27,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-27 00:44:27,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:27,389 [ 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-27 00:44:27,404 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-27 00:44:27,404 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-27 00:44:27,404 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-27 00:44:27,405 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-27 00:44:27,405 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-27 00:44:27,408 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-27 00:44:27,413 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-27 00:44:27,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:27,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:27,786 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-27 00:44:27,791 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-27 00:44:27,793 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#401](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/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-27 00:44:27,796 [ scc.config] DEBUG Found github.token
2025-04-27 00:44:27,796 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-27 00:44:27,796 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:44:27,833 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:27,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:27,835 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:44:27,872 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:27,876 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6efe650> has no local changes
2025-04-27 00:44:27,876 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:27,884 [ scc.git] DEBUG [detached HEAD 13c3a2c] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:27,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:27,884 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:28,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:28,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-27 00:44:28,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:28,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-27 00:44:29,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:29,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-27 00:44:29,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:29,894 [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-27 00:44:30,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:30,370 [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-27 00:44:30,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:30,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-27 00:44:31,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:31,298 [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-27 00:44:31,298 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:44:31,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:31,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-27 00:44:31,787 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-27 00:44:32,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:32,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-27 00:44:32,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:32,872 [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-27 00:44:33,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:33,448 [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-27 00:44:33,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:33,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-27 00:44:34,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:34,351 [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-27 00:44:34,352 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-27 00:44:34,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:34,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-27 00:44:34,857 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-27 00:44:35,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:35,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-27 00:44:35,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:35,883 [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-27 00:44:36,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:36,426 [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-27 00:44:36,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:36,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-27 00:44:37,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:37,385 [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-27 00:44:37,386 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-27 00:44:37,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:37,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-27 00:44:38,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:38,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-27 00:44:38,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:38,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-27 00:44:39,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:39,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-27 00:44:39,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:39,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-27 00:44:40,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:40,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-27 00:44:40,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:40,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-27 00:44:40,921 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:40,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-27 00:44:40,921 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:40,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:40,924 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:40,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:40,926 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:40,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:40,932 [ scc.git] DEBUG Already up to date.
2025-04-27 00:44:40,932 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-27 00:44:41,200 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-27 00:44:41,200 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-27 00:44:41,204 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-27 00:44:41,480 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-27 00:44:41,480 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-27 00:44:41,484 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-27 00:44:41,768 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-27 00:44:41,769 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-27 00:44:41,773 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:41,773 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:41,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:41,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-27 00:44:41,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:41,780 [ 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-27 00:44:41,788 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:41,792 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-27 00:44:41,792 [ scc.git] DEBUG package.json | 2 +-
2025-04-27 00:44:41,792 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-27 00:44:41,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:41,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:41,981 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-27 00:44:41,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:41,986 [ 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-27 00:44:41,996 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-27 00:44:41,996 [ scc.git] DEBUG Auto-merging package.json
2025-04-27 00:44:41,997 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:42,000 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-27 00:44:42,000 [ scc.git] DEBUG package.json | 2 +-
2025-04-27 00:44:42,000 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-27 00:44:42,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:42,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:42,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-27 00:44:42,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:42,400 [ 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-27 00:44:42,409 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:42,412 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-27 00:44:42,412 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-27 00:44:42,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:42,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:42,810 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:44:42,849 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:42,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:42,851 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:44:42,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:42,893 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6e15b10> has no local changes
2025-04-27 00:44:42,893 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:42,900 [ scc.git] DEBUG [detached HEAD f9eb56d] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:42,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:42,900 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:43,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:43,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-27 00:44:43,251 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:43,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-27 00:44:43,251 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:43,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:43,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:43,256 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:43,256 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:43,259 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:43,262 [ scc.git] DEBUG Already up to date.
2025-04-27 00:44:43,262 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:43,262 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:43,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:43,264 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:44:43,301 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:43,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:43,303 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:44:43,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:43,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6eff690> has no local changes
2025-04-27 00:44:43,342 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:43,348 [ scc.git] DEBUG [detached HEAD 09d02d2] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:43,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:43,349 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:43,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:43,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-27 00:44:44,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:44,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-27 00:44:44,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:44,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-27 00:44:45,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:45,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-27 00:44:45,251 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:45,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-27 00:44:45,252 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:45,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:45,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:45,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:45,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:45,260 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:45,263 [ scc.git] DEBUG Already up to date.
2025-04-27 00:44:45,263 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:45,263 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:45,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:45,265 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:44:45,303 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:45,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:45,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:44:45,341 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:45,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df70c8bd0> has no local changes
2025-04-27 00:44:45,345 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:45,351 [ scc.git] DEBUG [detached HEAD 28cc58c] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:45,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:45,351 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:45,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:45,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-27 00:44:46,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:46,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-27 00:44:46,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:46,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-27 00:44:46,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:47,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-27 00:44:47,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:47,738 [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-27 00:44:47,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:48,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-27 00:44:48,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:48,630 [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-27 00:44:48,630 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-27 00:44:48,630 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:48,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-27 00:44:48,630 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:48,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:48,633 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:48,635 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:48,635 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:48,638 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:48,641 [ scc.git] DEBUG Already up to date.
2025-04-27 00:44:48,642 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-27 00:44:48,953 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-27 00:44:48,953 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-27 00:44:48,957 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:48,957 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:48,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:48,959 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-27 00:44:48,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:48,965 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-27 00:44:48,974 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG Auto-merging setup.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-27 00:44:48,974 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-27 00:44:48,974 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-27 00:44:48,977 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-27 00:44:48,981 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-27 00:44:48,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:49,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:49,149 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-27 00:44:49,153 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-27 00:44:49,156 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#401](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-04-27 00:44:49,158 [ scc.config] DEBUG Found github.token
2025-04-27 00:44:49,158 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-27 00:44:49,158 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:44:49,195 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:49,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:49,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:44:49,233 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:44:49,237 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6ee8bd0> has no local changes
2025-04-27 00:44:49,237 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:44:49,243 [ scc.git] DEBUG [detached HEAD 3a6328b] merge master -Dorg -Ssuccess-only
2025-04-27 00:44:49,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:44:49,244 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:44:49,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:49,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-27 00:44:49,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:50,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-27 00:44:50,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:50,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-27 00:44:50,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:51,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-27 00:44:51,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:51,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-27 00:44:51,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:52,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-27 00:44:52,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:52,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-04-27 00:44:52,652 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-04-27 00:44:52,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:53,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-27 00:44:53,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:53,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-27 00:44:53,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:54,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-27 00:44:54,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:54,639 [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-27 00:44:54,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:55,148 [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-27 00:44:55,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:55,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-27 00:44:55,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:56,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-27 00:44:56,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:56,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-27 00:44:56,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:57,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-27 00:44:57,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:57,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-27 00:44:57,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:58,127 [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-27 00:44:58,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:58,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-27 00:44:58,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:58,995 [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-27 00:44:58,996 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-27 00:44:58,996 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:44:58,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-27 00:44:58,996 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:58,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:58,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:44:59,001 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:44:59,001 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:44:59,004 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:44:59,007 [ scc.git] DEBUG Already up to date.
2025-04-27 00:44:59,007 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-27 00:44:59,293 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-27 00:44:59,293 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-27 00:44:59,297 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-27 00:44:59,574 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-27 00:44:59,574 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-04-27 00:44:59,578 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:44:59,578 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:44:59,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:59,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-27 00:44:59,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:59,586 [ 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-27 00:44:59,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:59,602 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-27 00:44:59,602 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-27 00:44:59,602 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-27 00:44:59,603 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-27 00:44:59,603 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-27 00:44:59,603 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-27 00:44:59,603 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-27 00:44:59,603 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-27 00:44:59,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-27 00:44:59,604 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-27 00:44:59,604 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-27 00:44:59,604 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-27 00:44:59,605 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-27 00:44:59,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:44:59,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-27 00:44:59,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:44:59,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-27 00:44:59,807 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:44:59,809 [ scc.git] DEBUG docker | 1 +
2025-04-27 00:44:59,809 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-04-27 00:45:00,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:00,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:00,207 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:00,247 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:00,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:00,249 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:00,286 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:00,291 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6effc10> has no local changes
2025-04-27 00:45:00,291 [ 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'
- PR 76 will-moore 'Run cli deps'
Generated by OMERO-plugins-push#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:00,297 [ scc.git] DEBUG [detached HEAD 03ff896] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:00,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:00,297 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:00,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:00,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-27 00:45:00,645 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:00,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-27 00:45:00,645 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:00,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:00,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:45:00,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:00,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:45:00,653 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:45:00,656 [ scc.git] DEBUG Already up to date.
2025-04-27 00:45:00,656 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:00,656 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:00,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:00,658 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:00,695 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:00,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:00,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:00,733 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:00,736 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6eeab10> has no local changes
2025-04-27 00:45:00,736 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:00,742 [ scc.git] DEBUG [detached HEAD 84e3618] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:00,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:00,743 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:00,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:01,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-27 00:45:01,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:01,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-27 00:45:01,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:02,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-27 00:45:02,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:02,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-27 00:45:02,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:03,161 [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-27 00:45:03,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:03,618 [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-27 00:45:03,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:04,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-27 00:45:04,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:04,602 [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-27 00:45:04,602 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-27 00:45:04,602 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:04,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-27 00:45:04,603 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:04,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:04,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:45:04,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:04,608 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:45:04,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:45:04,613 [ scc.git] DEBUG Already up to date.
2025-04-27 00:45:04,613 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-27 00:45:04,931 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-27 00:45:04,931 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-27 00:45:04,935 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:04,935 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:04,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:04,938 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-27 00:45:04,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:04,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-27 00:45:04,951 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:45:04,953 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-27 00:45:04,953 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-27 00:45:04,953 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-27 00:45:04,953 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-27 00:45:04,953 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-27 00:45:04,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:05,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:05,112 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:05,149 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:05,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:05,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:05,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:05,193 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df6e6e190> has no local changes
2025-04-27 00:45:05,193 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:05,199 [ scc.git] DEBUG [detached HEAD 8d09227] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:05,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:05,199 [ scc.git] INFO Overriding base-branch from master to main
2025-04-27 00:45:05,199 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:05,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:05,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-27 00:45:05,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:06,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-27 00:45:06,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:06,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-27 00:45:06,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:07,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-27 00:45:07,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:07,642 [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-27 00:45:07,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:08,126 [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-27 00:45:08,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:08,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-27 00:45:08,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:09,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-27 00:45:09,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:09,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-27 00:45:09,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:10,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-27 00:45:10,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:10,574 [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-27 00:45:10,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:11,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-27 00:45:11,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:11,447 [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-27 00:45:11,447 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-27 00:45:11,447 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:11,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-27 00:45:11,447 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:11,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:11,450 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-27 00:45:11,452 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:11,453 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-27 00:45:11,455 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-27 00:45:11,458 [ scc.git] DEBUG Already up to date.
2025-04-27 00:45:11,459 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-27 00:45:11,784 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-27 00:45:11,784 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-27 00:45:11,789 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:11,789 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:11,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:11,791 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-27 00:45:11,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:11,796 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-27 00:45:11,804 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-27 00:45:11,804 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-27 00:45:11,804 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-27 00:45:11,805 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-27 00:45:11,807 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-27 00:45:11,811 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-27 00:45:11,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:11,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:11,979 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-27 00:45:11,982 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-27 00:45:11,984 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#401](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-27 00:45:11,987 [ scc.config] DEBUG Found github.token
2025-04-27 00:45:11,987 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-27 00:45:11,987 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:12,024 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:12,065 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:12,068 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df45454d0> has no local changes
2025-04-27 00:45:12,068 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:12,074 [ scc.git] DEBUG [detached HEAD f0a2287] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:12,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:12,075 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:12,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:12,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-27 00:45:12,418 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:12,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-27 00:45:12,418 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,420 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:45:12,423 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:12,423 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:45:12,425 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:45:12,428 [ scc.git] DEBUG Already up to date.
2025-04-27 00:45:12,428 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:12,428 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,431 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:12,469 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,471 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:12,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:12,511 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df4533fd0> has no local changes
2025-04-27 00:45:12,511 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:12,517 [ scc.git] DEBUG [detached HEAD 169c08f] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:12,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:12,517 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:12,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:12,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-27 00:45:12,840 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:12,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-27 00:45:12,840 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:45:12,845 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:12,845 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:45:12,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:45:12,851 [ scc.git] DEBUG Already up to date.
2025-04-27 00:45:12,851 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:12,851 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,853 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:12,890 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:12,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:12,893 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:12,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:12,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df459e710> has no local changes
2025-04-27 00:45:12,933 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:12,940 [ scc.git] DEBUG [detached HEAD ce85ba6] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:12,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:12,940 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:13,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:13,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-27 00:45:13,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:13,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-27 00:45:14,092 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:14,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-27 00:45:14,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:14,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-27 00:45:15,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:15,288 [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-27 00:45:15,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:15,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-27 00:45:16,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:16,247 [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-27 00:45:16,247 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-27 00:45:16,247 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:16,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-27 00:45:16,247 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:16,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:16,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-27 00:45:16,252 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:16,253 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-27 00:45:16,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-27 00:45:16,258 [ scc.git] DEBUG Already up to date.
2025-04-27 00:45:16,258 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-27 00:45:16,569 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-27 00:45:16,569 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-27 00:45:16,574 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:16,574 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:16,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:16,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-27 00:45:16,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:16,581 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-27 00:45:16,590 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-27 00:45:16,590 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-27 00:45:16,590 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-27 00:45:16,591 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-27 00:45:16,594 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-27 00:45:16,598 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-27 00:45:16,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:16,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:16,767 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-27 00:45:16,771 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-27 00:45:16,773 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#401](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-27 00:45:16,775 [ scc.config] DEBUG Found github.token
2025-04-27 00:45:16,775 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-27 00:45:16,776 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:16,813 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:16,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:16,815 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:16,851 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:16,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df4521a10> has no local changes
2025-04-27 00:45:16,855 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:16,861 [ scc.git] DEBUG [detached HEAD eaa91c5] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:16,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:16,862 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-27 00:45:16,862 [ scc.repo] DEBUG ## PRs found:
2025-04-27 00:45:17,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:17,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-27 00:45:17,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:17,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-27 00:45:18,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:18,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-27 00:45:18,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:18,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-27 00:45:18,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:19,247 [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-27 00:45:19,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:19,719 [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-27 00:45:19,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:20,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-27 00:45:20,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:20,612 [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-27 00:45:20,612 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-27 00:45:20,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:21,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-27 00:45:21,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:21,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-27 00:45:21,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:21,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-27 00:45:22,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:22,463 [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-27 00:45:22,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:22,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-27 00:45:23,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:23,336 [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-27 00:45:23,336 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-27 00:45:23,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:23,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-27 00:45:24,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:24,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-27 00:45:24,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:24,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-27 00:45:25,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:25,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-27 00:45:25,385 [ scc.repo] DEBUG ## Branches found:
2025-04-27 00:45:25,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-27 00:45:25,385 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:25,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:25,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-27 00:45:25,390 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-27 00:45:25,390 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-27 00:45:25,393 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-27 00:45:25,401 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-27 00:45:25,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:26,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-27 00:45:26,266 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-27 00:45:26,578 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-27 00:45:26,578 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-27 00:45:26,583 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-27 00:45:26,844 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-27 00:45:26,844 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-27 00:45:26,848 [ scc.git] DEBUG ## Unique users: []
2025-04-27 00:45:26,848 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:26,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:26,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-27 00:45:26,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:26,858 [ 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-27 00:45:26,868 [ 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-27 00:45:26,869 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-27 00:45:26,869 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-27 00:45:26,872 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-27 00:45:26,875 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-27 00:45:26,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:27,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:27,053 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-27 00:45:27,059 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-27 00:45:27,063 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#401](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-27 00:45:27,065 [ scc.config] DEBUG Found github.token
2025-04-27 00:45:27,065 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-27 00:45:27,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-27 00:45:27,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:27,072 [ 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-27 00:45:27,081 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-27 00:45:27,084 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-27 00:45:27,084 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-27 00:45:27,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:27,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:27,464 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-27 00:45:27,501 [ scc.git] DEBUG Get sha1 of %s
2025-04-27 00:45:27,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-27 00:45:27,504 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:27,540 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:27,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df45bfc10> has no local changes
2025-04-27 00:45:27,544 [ 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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:27,551 [ scc.git] DEBUG [detached HEAD da554d0] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:27,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:27,551 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-27 00:45:27,624 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-27 00:45:27,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:27,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:27,870 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-27 00:45:27,872 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-27 00:45:28,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:28,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:28,295 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-27 00:45:28,297 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-27 00:45:28,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:28,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:28,706 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-27 00:45:28,708 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-27 00:45:28,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:29,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:29,139 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-27 00:45:29,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:29,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:29,553 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-27 00:45:29,555 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-27 00:45:29,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:29,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:29,971 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-27 00:45:29,973 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-27 00:45:30,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:30,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:30,377 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-27 00:45:30,379 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-27 00:45:30,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:30,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:30,798 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-27 00:45:30,801 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-27 00:45:31,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:31,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:31,208 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-27 00:45:31,210 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-27 00:45:31,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:31,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:31,627 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-27 00:45:31,629 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-27 00:45:31,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:32,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:32,070 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-27 00:45:32,072 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-27 00:45:32,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:32,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:32,486 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-27 00:45:32,488 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-27 00:45:32,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:32,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:32,905 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-27 00:45:33,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:33,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:33,329 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-27 00:45:33,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:33,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:33,742 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-27 00:45:33,744 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-27 00:45:33,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:34,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:34,148 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-27 00:45:34,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:34,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:34,584 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-27 00:45:34,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:34,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:34,988 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-27 00:45:34,990 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-27 00:45:35,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:35,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:35,406 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-27 00:45:35,408 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-27 00:45:35,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:35,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:35,846 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-27 00:45:35,848 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-27 00:45:36,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:36,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:36,263 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-27 00:45:36,265 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-27 00:45:36,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-27 00:45:36,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-27 00:45:36,697 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-27 00:45:36,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-27 00:45:36,785 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6df7790d50> has local changes
2025-04-27 00:45:36,785 [ 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..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- 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'
- PR 76 will-moore 'Run cli deps'
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#401 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/401/)'
2025-04-27 00:45:36,799 [ scc.git] DEBUG [detached HEAD bf84270] merge master -Dorg -Ssuccess-only
2025-04-27 00:45:36,799 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-27 00:45:36,799 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-27 00:45:36,799 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,799 [ scc.merge] INFO
2025-04-27 00:45:36,799 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,799 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-27 00:45:36,799 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-27 00:45:36,799 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-27 00:45:36,799 [ scc.merge] INFO
2025-04-27 00:45:36,799 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-27 00:45:36,799 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,799 [ scc.merge] INFO
2025-04-27 00:45:36,799 [ scc.merge] INFO
2025-04-27 00:45:36,799 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-27 00:45:36,799 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-27 00:45:36,800 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-27 00:45:36,800 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-27 00:45:36,800 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-27 00:45:36,800 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-27 00:45:36,800 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-04-27 00:45:36,800 [ scc.merge] INFO Previously merged:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-27 00:45:36,800 [ scc.merge] INFO
2025-04-27 00:45:36,800 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-27 00:45:36,800 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-27 00:45:36,800 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-27 00:45:36,800 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-27 00:45:36,800 [ scc.merge] INFO Previously merged:
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-27 00:45:36,801 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-27 00:45:36,801 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-27 00:45:36,801 [ scc.merge] INFO
2025-04-27 00:45:36,801 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-27 00:45:36,801 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-27 00:45:36,801 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-27 00:45:36,802 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-27 00:45:36,802 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-27 00:45:36,802 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-27 00:45:36,802 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-27 00:45:36,802 [ scc.merge] INFO Previously merged:
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-27 00:45:36,802 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-27 00:45:36,802 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,802 [ scc.merge] INFO
2025-04-27 00:45:36,802 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-27 00:45:36,802 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-27 00:45:36,803 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-27 00:45:36,803 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-27 00:45:36,803 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-27 00:45:36,803 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-27 00:45:36,803 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-27 00:45:36,803 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-27 00:45:36,803 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-27 00:45:36,803 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,803 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,803 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-27 00:45:36,803 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-27 00:45:36,804 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-27 00:45:36,804 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-27 00:45:36,804 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-27 00:45:36,804 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-27 00:45:36,804 [ scc.merge] INFO Already up to date.
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,804 [ scc.merge] INFO Repository: ome/scripts
2025-04-27 00:45:36,804 [ scc.merge] INFO Excluded PRs:
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-27 00:45:36,804 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-27 00:45:36,804 [ scc.merge] INFO Previously merged:
2025-04-27 00:45:36,804 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-27 00:45:36,804 [ scc.merge] INFO
2025-04-27 00:45:36,805 [ scc.merge] INFO Merged PRs:
2025-04-27 00:45:36,805 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-27 00:45:36,805 [ scc.merge] INFO
2025-04-27 00:45:36,805 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-27 00:45:36,805 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-27 00:45:36,805 [ scc.merge] INFO
2025-04-27 00:45:36,805 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-27 00:45:36,805 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-27 00:45:36,807 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-27 00:45:36,809 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-27 00:45:36,812 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-27 00:45:36,814 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-27 00:45:36,816 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-27 00:45:36,818 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-27 00:45:36,821 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-27 00:45:36,823 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-27 00:45:36,825 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-27 00:45:36,827 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-27 00:45:36,829 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-27 00:45:36,832 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-27 00:45:36,834 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-27 00:45:36,836 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-27 00:45:36,838 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-27 00:45:36,840 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-27 00:45:36,842 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-27 00:45:36,845 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-27 00:45:36,847 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-27 00:45:36,849 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-27 00:45:36,851 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-27 00:45:36,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-27 00:45:36,854 [ scc.git] DEBUG Calling 'git remote'
2025-04-27 00:45:36,856 [ 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 3897275] 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 70f47a3] 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-27 00:46:23,878 [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-27 00:46:33,175 [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-27 00:46:35,748 [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-27 00:46:40,446 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-27 00:47:19,934 [ 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/eb00aee0/images/svgs/logo.svg){kind=logo}
