Skipping 225 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-14 00:40:40,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:40,149 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-14 00:40:40,186 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-14 00:40:40,186 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-14 00:40:40,186 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:40:40,186 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:40:40,189 [ scc.git] DEBUG Calling 'git reset --hard d60b048cdc69663d09f8e6c39ff64cb1e6bd2c69'
2025-04-14 00:40:40,197 [ scc.git] DEBUG HEAD is now at d60b048 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-14 00:40:40,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:40,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:40:40,559 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-14 00:40:40,562 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-14 00:40:40,565 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-14 00:40:40,567 [ scc.config] DEBUG Found github.token
2025-04-14 00:40:40,567 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-14 00:40:40,567 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-14 00:40:40,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:40,576 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-14 00:40:40,593 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:40:40,596 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-14 00:40:40,596 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-14 00:40:40,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:40,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:40:40,970 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:40:41,007 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:41,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:41,010 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:40:41,047 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:40:41,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f40a090> has no local changes
2025-04-14 00:40:41,054 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:40:41,061 [ scc.git] DEBUG [detached HEAD 867bede] merge master -Dorg -Ssuccess-only
2025-04-14 00:40:41,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:40:41,061 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:40:41,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:41,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-14 00:40:41,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:42,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-14 00:40:42,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:42,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-14 00:40:42,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:42,973 [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-14 00:40:43,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:43,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-14 00:40:43,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:43,931 [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-14 00:40:43,932 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:40:44,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:44,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-14 00:40:44,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:44,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-14 00:40:45,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:45,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-14 00:40:45,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:45,898 [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-14 00:40:46,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:46,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-14 00:40:46,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:46,882 [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-14 00:40:46,883 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-14 00:40:46,883 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:40:46,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-14 00:40:46,883 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:46,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:46,886 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:40:46,888 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:40:46,888 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:40:46,891 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:40:46,894 [ scc.git] DEBUG Already up to date.
2025-04-14 00:40:46,894 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-14 00:40:47,172 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-14 00:40:47,172 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-14 00:40:47,176 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-14 00:40:47,472 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-14 00:40:47,472 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-14 00:40:47,476 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:40:47,476 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:47,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:47,479 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-14 00:40:47,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:47,485 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-14 00:40:47,494 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:40:47,497 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-14 00:40:47,497 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-14 00:40:47,497 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-14 00:40:47,497 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-14 00:40:47,497 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-14 00:40:47,497 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-14 00:40:47,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:47,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:40:47,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-14 00:40:47,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:47,665 [ 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-14 00:40:47,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:40:47,676 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-14 00:40:47,676 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-14 00:40:47,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:48,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:40:48,065 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:40:48,103 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:48,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:48,105 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:40:48,142 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:40:48,146 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f340c10> has no local changes
2025-04-14 00:40:48,146 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:40:48,152 [ scc.git] DEBUG [detached HEAD 9c85252] merge master -Dorg -Ssuccess-only
2025-04-14 00:40:48,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:40:48,153 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:40:48,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:48,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-14 00:40:48,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:49,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-14 00:40:49,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:49,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-14 00:40:49,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:50,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-14 00:40:50,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:50,691 [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-14 00:40:50,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:51,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-14 00:40:51,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:51,701 [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-14 00:40:51,702 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-14 00:40:51,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:52,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-14 00:40:52,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:52,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-14 00:40:52,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:53,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-14 00:40:53,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:53,704 [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-14 00:40:53,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:54,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-14 00:40:54,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:54,664 [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-14 00:40:54,665 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-14 00:40:54,665 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:40:54,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-14 00:40:54,665 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:54,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:54,668 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:40:54,670 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:40:54,670 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:40:54,673 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:40:54,681 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-14 00:40:54,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:55,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-14 00:40:55,342 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-14 00:40:55,643 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-14 00:40:55,643 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-14 00:40:55,647 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-14 00:40:55,921 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-14 00:40:55,921 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-14 00:40:55,925 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:40:55,925 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:55,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:55,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-14 00:40:55,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:55,934 [ 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-14 00:40:55,948 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-14 00:40:55,948 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-14 00:40:55,948 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-14 00:40:55,948 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-14 00:40:55,948 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:40:55,948 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:40:55,951 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-14 00:40:55,956 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-14 00:40:55,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:56,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:40:56,125 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-14 00:40:56,130 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-14 00:40:56,133 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-14 00:40:56,135 [ scc.config] DEBUG Found github.token
2025-04-14 00:40:56,135 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-14 00:40:56,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-14 00:40:56,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:56,142 [ 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-14 00:40:56,156 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-14 00:40:56,156 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-14 00:40:56,156 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-14 00:40:56,157 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:40:56,157 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:40:56,160 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-14 00:40:56,164 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-14 00:40:56,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:56,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:40:56,534 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-14 00:40:56,538 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-14 00:40:56,541 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/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-14 00:40:56,543 [ scc.config] DEBUG Found github.token
2025-04-14 00:40:56,543 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-14 00:40:56,543 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:40:56,581 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:40:56,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:40:56,583 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:40:56,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:40:56,624 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f2dd790> has no local changes
2025-04-14 00:40:56,624 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:40:56,631 [ scc.git] DEBUG [detached HEAD 81d5a86] merge master -Dorg -Ssuccess-only
2025-04-14 00:40:56,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:40:56,631 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:40:56,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:57,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-14 00:40:57,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:57,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-14 00:40:57,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:58,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-14 00:40:58,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:58,622 [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-14 00:40:58,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:59,107 [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-14 00:40:59,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:40:59,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-14 00:40:59,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:00,077 [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-14 00:41:00,078 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:41:00,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:00,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-14 00:41:00,563 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-14 00:41:00,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:01,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-14 00:41:01,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:01,648 [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-14 00:41:01,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:02,202 [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-14 00:41:02,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:02,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-14 00:41:03,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:03,215 [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-14 00:41:03,215 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-14 00:41:03,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:03,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-14 00:41:03,685 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-14 00:41:03,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:04,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-14 00:41:04,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:04,757 [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-14 00:41:05,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:05,258 [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-14 00:41:05,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:05,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-14 00:41:06,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:06,285 [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-14 00:41:06,286 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-14 00:41:06,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:06,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-14 00:41:07,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:07,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-14 00:41:07,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:07,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-14 00:41:08,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:08,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-14 00:41:08,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:08,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-14 00:41:08,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:09,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-14 00:41:09,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:09,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-14 00:41:09,864 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:09,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-14 00:41:09,864 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:09,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:09,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:09,869 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:09,869 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:09,873 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:09,876 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:09,876 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-14 00:41:10,149 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-14 00:41:10,150 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-14 00:41:10,154 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-14 00:41:10,431 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-14 00:41:10,431 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-14 00:41:10,435 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-14 00:41:10,694 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-14 00:41:10,694 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-14 00:41:10,698 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:10,698 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:10,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:10,701 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-14 00:41:10,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:10,706 [ 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-14 00:41:10,714 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:41:10,717 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-14 00:41:10,717 [ scc.git] DEBUG package.json | 2 +-
2025-04-14 00:41:10,718 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-14 00:41:10,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:10,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:10,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-14 00:41:10,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:10,882 [ 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-14 00:41:10,892 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-14 00:41:10,892 [ scc.git] DEBUG Auto-merging package.json
2025-04-14 00:41:10,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:41:10,896 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-14 00:41:10,896 [ scc.git] DEBUG package.json | 2 +-
2025-04-14 00:41:10,896 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-14 00:41:11,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:11,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:11,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-14 00:41:11,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:11,295 [ 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-14 00:41:11,303 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:41:11,306 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-14 00:41:11,306 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-14 00:41:11,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:11,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:11,723 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:11,761 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:11,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:11,764 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:11,800 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:11,804 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f342710> has no local changes
2025-04-14 00:41:11,804 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:11,811 [ scc.git] DEBUG [detached HEAD a476c96] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:11,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:11,811 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:11,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:12,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-14 00:41:12,161 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:12,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-14 00:41:12,162 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:12,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:12,164 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:12,166 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:12,166 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:12,169 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:12,172 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:12,172 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:12,172 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:12,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:12,174 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:12,212 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:12,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:12,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:12,251 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:12,254 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f32f3d0> has no local changes
2025-04-14 00:41:12,254 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:12,260 [ scc.git] DEBUG [detached HEAD 593376f] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:12,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:12,260 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:12,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:12,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-14 00:41:12,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:13,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-14 00:41:13,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:13,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-14 00:41:13,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:14,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-14 00:41:14,233 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:14,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-14 00:41:14,233 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:14,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:14,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:14,238 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:14,238 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:14,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:14,243 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:14,244 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:14,244 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:14,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:14,246 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:14,283 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:14,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:14,285 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:14,321 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:14,325 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f513790> has no local changes
2025-04-14 00:41:14,325 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:14,331 [ scc.git] DEBUG [detached HEAD f06f27e] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:14,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:14,331 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:14,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:14,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-14 00:41:15,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:15,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-14 00:41:15,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:15,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-14 00:41:16,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:16,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-14 00:41:16,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:16,814 [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-14 00:41:17,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:17,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-14 00:41:17,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:17,735 [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-14 00:41:17,736 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-14 00:41:17,736 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:17,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-14 00:41:17,736 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:17,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:17,739 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:17,741 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:17,741 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:17,744 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:17,747 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:17,747 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-14 00:41:18,065 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-14 00:41:18,066 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-14 00:41:18,070 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:18,070 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:18,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:18,073 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-14 00:41:18,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:18,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-14 00:41:18,087 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG Auto-merging setup.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-14 00:41:18,087 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:41:18,088 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:41:18,090 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-14 00:41:18,095 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-14 00:41:18,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:18,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:18,271 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-14 00:41:18,274 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-14 00:41:18,277 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-04-14 00:41:18,279 [ scc.config] DEBUG Found github.token
2025-04-14 00:41:18,279 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-14 00:41:18,279 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:18,317 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:18,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:18,319 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:18,355 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:18,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f2d2ad0> has no local changes
2025-04-14 00:41:18,359 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:18,365 [ scc.git] DEBUG [detached HEAD 7164ebb] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:18,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:18,366 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:18,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:18,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-14 00:41:19,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:19,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-14 00:41:19,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:19,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-14 00:41:20,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:20,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-14 00:41:20,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:20,752 [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-14 00:41:21,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:21,216 [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-14 00:41:21,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:21,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-14 00:41:21,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:22,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-14 00:41:22,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:22,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-14 00:41:22,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:23,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-14 00:41:23,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:23,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-14 00:41:23,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:24,171 [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-14 00:41:24,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:24,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-14 00:41:24,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:25,076 [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-14 00:41:25,076 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-14 00:41:25,077 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:25,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-14 00:41:25,077 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:25,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:25,080 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:25,082 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:25,082 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:25,085 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:25,088 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:25,088 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-14 00:41:25,370 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-14 00:41:25,370 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-14 00:41:25,374 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:25,374 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:25,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:25,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-14 00:41:25,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:25,383 [ 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-14 00:41:25,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-14 00:41:25,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-14 00:41:25,400 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-14 00:41:25,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:25,400 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-14 00:41:25,401 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-14 00:41:25,401 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-14 00:41:25,401 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-14 00:41:25,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:25,568 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:25,607 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:25,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:25,609 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:25,645 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:25,650 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f32df50> has no local changes
2025-04-14 00:41:25,650 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:25,657 [ scc.git] DEBUG [detached HEAD f365496] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:25,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:25,657 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:25,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:26,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-14 00:41:26,012 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:26,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-14 00:41:26,013 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:26,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:26,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:26,017 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:26,017 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:26,020 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:26,023 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:26,023 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:26,023 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:26,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:26,025 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:26,062 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:26,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:26,064 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:26,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:26,104 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94d16be90> has no local changes
2025-04-14 00:41:26,105 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:26,111 [ scc.git] DEBUG [detached HEAD a8bff12] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:26,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:26,111 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:26,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:26,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-14 00:41:26,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:26,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-14 00:41:27,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:27,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-14 00:41:27,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:28,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-14 00:41:28,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:28,548 [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-14 00:41:28,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:29,035 [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-14 00:41:29,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:29,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-14 00:41:29,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:29,951 [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-14 00:41:29,951 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-14 00:41:29,951 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:29,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-14 00:41:29,951 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:29,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:29,954 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:29,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:29,957 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:29,959 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:29,963 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:29,963 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-14 00:41:30,252 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-14 00:41:30,252 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-14 00:41:30,256 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:30,257 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:30,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:30,259 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-14 00:41:30,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:30,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-14 00:41:30,272 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:41:30,275 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-14 00:41:30,275 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-14 00:41:30,275 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-14 00:41:30,275 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-14 00:41:30,275 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-14 00:41:30,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:30,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:30,436 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:30,474 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:30,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:30,476 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:30,513 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:30,516 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94d174590> has no local changes
2025-04-14 00:41:30,516 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:30,523 [ scc.git] DEBUG [detached HEAD 37cf016] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:30,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:30,523 [ scc.git] INFO Overriding base-branch from master to main
2025-04-14 00:41:30,523 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:30,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:31,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-14 00:41:31,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:31,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-14 00:41:31,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:32,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-14 00:41:32,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:32,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-14 00:41:32,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:33,066 [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-14 00:41:33,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:33,576 [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-14 00:41:33,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:34,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-14 00:41:34,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:34,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-14 00:41:34,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:35,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-14 00:41:35,343 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:35,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-14 00:41:35,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:36,080 [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-14 00:41:36,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:36,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-14 00:41:36,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:37,064 [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-14 00:41:37,065 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-14 00:41:37,065 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:37,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-14 00:41:37,065 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:37,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:37,068 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-14 00:41:37,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:37,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-14 00:41:37,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-14 00:41:37,076 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:37,076 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-14 00:41:37,380 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-14 00:41:37,380 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-14 00:41:37,384 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:37,384 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:37,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:37,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-14 00:41:37,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:37,392 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-14 00:41:37,400 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-14 00:41:37,400 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-14 00:41:37,400 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:41:37,400 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:41:37,403 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-14 00:41:37,407 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-14 00:41:37,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:37,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:37,572 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-14 00:41:37,575 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-14 00:41:37,577 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-14 00:41:37,580 [ scc.config] DEBUG Found github.token
2025-04-14 00:41:37,580 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-14 00:41:37,580 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:37,617 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:37,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:37,619 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:37,656 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:37,659 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f512a90> has no local changes
2025-04-14 00:41:37,659 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:37,665 [ scc.git] DEBUG [detached HEAD 1bdb8ed] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:37,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:37,666 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:37,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:38,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-14 00:41:38,016 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:38,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-14 00:41:38,016 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:38,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:38,019 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:38,021 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:38,021 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:38,024 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:38,027 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:38,027 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:38,027 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:38,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:38,029 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:38,066 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:38,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:38,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:38,105 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:38,108 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94d1c4290> has no local changes
2025-04-14 00:41:38,108 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:38,114 [ scc.git] DEBUG [detached HEAD 4820c42] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:38,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:38,115 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:38,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:38,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-14 00:41:38,450 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:38,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-14 00:41:38,450 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:38,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:38,453 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:38,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:38,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:38,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:38,460 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:38,460 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:38,460 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:38,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:38,463 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:38,500 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:38,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:38,502 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:38,538 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:38,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f281790> has no local changes
2025-04-14 00:41:38,541 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:38,547 [ scc.git] DEBUG [detached HEAD 8d8bffe] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:38,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:38,548 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:38,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:39,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-14 00:41:39,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:39,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-14 00:41:39,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:39,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-14 00:41:40,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:40,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-14 00:41:40,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:40,974 [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-14 00:41:41,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:41,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-14 00:41:41,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:41,918 [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-14 00:41:41,918 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-14 00:41:41,918 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:41,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-14 00:41:41,918 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:41,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:41,921 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-14 00:41:41,923 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:41,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-14 00:41:41,926 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-14 00:41:41,929 [ scc.git] DEBUG Already up to date.
2025-04-14 00:41:41,929 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-14 00:41:42,208 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-14 00:41:42,208 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-14 00:41:42,212 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:42,212 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:42,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:42,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-14 00:41:42,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:42,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-14 00:41:42,228 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-14 00:41:42,228 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-14 00:41:42,229 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:41:42,229 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:41:42,232 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-14 00:41:42,237 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-14 00:41:42,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:42,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:42,426 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-14 00:41:42,429 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-14 00:41:42,432 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-14 00:41:42,434 [ scc.config] DEBUG Found github.token
2025-04-14 00:41:42,434 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-14 00:41:42,434 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:42,471 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:42,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:42,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:42,510 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:42,514 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94d1c4250> has no local changes
2025-04-14 00:41:42,514 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:42,520 [ scc.git] DEBUG [detached HEAD 9ffdc94] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:42,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:42,521 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-14 00:41:42,521 [ scc.repo] DEBUG ## PRs found:
2025-04-14 00:41:42,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:42,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-14 00:41:43,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:43,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-14 00:41:43,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:43,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-14 00:41:44,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:44,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-14 00:41:44,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:45,015 [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-14 00:41:45,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:45,531 [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-14 00:41:45,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:45,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-14 00:41:46,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:46,419 [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-14 00:41:46,420 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-14 00:41:46,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:46,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-14 00:41:47,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:47,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-14 00:41:47,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:47,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-14 00:41:48,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:48,403 [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-14 00:41:48,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:48,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-14 00:41:49,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:49,326 [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-14 00:41:49,326 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-14 00:41:49,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:49,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-14 00:41:50,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:50,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-14 00:41:50,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:50,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-14 00:41:51,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:51,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-14 00:41:51,475 [ scc.repo] DEBUG ## Branches found:
2025-04-14 00:41:51,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-14 00:41:51,475 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:51,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:51,478 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-14 00:41:51,480 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-14 00:41:51,480 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-14 00:41:51,483 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-14 00:41:51,491 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-14 00:41:51,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:52,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-14 00:41:52,168 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-14 00:41:52,471 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-14 00:41:52,471 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-14 00:41:52,475 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-14 00:41:52,745 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-14 00:41:52,745 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-14 00:41:52,750 [ scc.git] DEBUG ## Unique users: []
2025-04-14 00:41:52,750 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:52,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:52,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-14 00:41:52,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:52,760 [ 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-14 00:41:52,771 [ 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-14 00:41:52,771 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-14 00:41:52,771 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-14 00:41:52,774 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-14 00:41:52,778 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-14 00:41:52,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:52,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:52,956 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-14 00:41:52,962 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-14 00:41:52,965 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#388](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-14 00:41:52,967 [ scc.config] DEBUG Found github.token
2025-04-14 00:41:52,968 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-14 00:41:52,968 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-14 00:41:52,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:52,974 [ 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-14 00:41:52,984 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-14 00:41:52,987 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-14 00:41:52,987 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-14 00:41:53,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:53,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:53,371 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-14 00:41:53,409 [ scc.git] DEBUG Get sha1 of %s
2025-04-14 00:41:53,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-14 00:41:53,411 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:53,449 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:41:53,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f511610> has no local changes
2025-04-14 00:41:53,453 [ 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#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:41:53,459 [ scc.git] DEBUG [detached HEAD 128c160] merge master -Dorg -Ssuccess-only
2025-04-14 00:41:53,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:41:53,459 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-14 00:41:53,533 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-14 00:41:53,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:53,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:53,799 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-14 00:41:53,800 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-14 00:41:54,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:54,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:54,214 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-14 00:41:54,216 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-14 00:41:54,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:54,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:54,623 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-14 00:41:54,625 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-14 00:41:54,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:55,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:55,030 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-14 00:41:55,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:55,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:55,438 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-14 00:41:55,440 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-14 00:41:55,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:55,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:55,848 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-14 00:41:55,849 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-14 00:41:56,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:56,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:56,257 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-14 00:41:56,259 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-14 00:41:56,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:56,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:56,670 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-14 00:41:56,672 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-14 00:41:56,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:57,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:57,087 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-14 00:41:57,089 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-14 00:41:57,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:57,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:57,496 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-14 00:41:57,498 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-14 00:41:57,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:57,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:57,931 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-14 00:41:57,933 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-14 00:41:58,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:58,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:58,353 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-14 00:41:58,355 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-14 00:41:58,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:58,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:58,765 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-14 00:41:59,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:59,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:59,183 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-14 00:41:59,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:41:59,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:41:59,587 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-14 00:41:59,589 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-14 00:41:59,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:00,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:00,013 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-14 00:42:00,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:00,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:00,419 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-14 00:42:00,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:00,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:00,843 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-14 00:42:00,845 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-14 00:42:01,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:01,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:01,252 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-14 00:42:01,254 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-14 00:42:01,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:01,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:01,663 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-14 00:42:01,665 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-14 00:42:01,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:02,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:02,499 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-14 00:42:02,501 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-14 00:42:02,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-14 00:42:02,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-14 00:42:02,913 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-14 00:42:02,913 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-14 00:42:03,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe94f23ca90> has local changes
2025-04-14 00:42:03,004 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#388 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/388/)'
2025-04-14 00:42:03,018 [ scc.git] DEBUG [detached HEAD b96dfac] merge master -Dorg -Ssuccess-only
2025-04-14 00:42:03,018 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-14 00:42:03,019 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-14 00:42:03,019 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-14 00:42:03,019 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-14 00:42:03,019 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-14 00:42:03,019 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-14 00:42:03,019 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-14 00:42:03,019 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-14 00:42:03,019 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-14 00:42:03,019 [ scc.merge] INFO
2025-04-14 00:42:03,019 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-14 00:42:03,020 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-14 00:42:03,020 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-14 00:42:03,020 [ scc.merge] INFO Previously merged:
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:42:03,020 [ scc.merge] INFO
2025-04-14 00:42:03,020 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-14 00:42:03,020 [ scc.merge] INFO
2025-04-14 00:42:03,020 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-14 00:42:03,020 [ scc.merge] INFO
2025-04-14 00:42:03,020 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-14 00:42:03,020 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-14 00:42:03,020 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-14 00:42:03,020 [ scc.merge] INFO Previously merged:
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:42:03,020 [ scc.merge] INFO
2025-04-14 00:42:03,020 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-14 00:42:03,020 [ scc.merge] INFO
2025-04-14 00:42:03,020 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,020 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-14 00:42:03,021 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-14 00:42:03,021 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-14 00:42:03,021 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-14 00:42:03,021 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,021 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-14 00:42:03,021 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:42:03,021 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-14 00:42:03,022 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-14 00:42:03,022 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-14 00:42:03,022 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-14 00:42:03,022 [ scc.merge] INFO Previously merged:
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-14 00:42:03,022 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-14 00:42:03,022 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-14 00:42:03,022 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,022 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-14 00:42:03,022 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,022 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-14 00:42:03,023 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-14 00:42:03,023 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-14 00:42:03,023 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-14 00:42:03,023 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-14 00:42:03,023 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-14 00:42:03,023 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-14 00:42:03,023 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-14 00:42:03,023 [ scc.merge] INFO
2025-04-14 00:42:03,023 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-14 00:42:03,023 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-14 00:42:03,023 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-14 00:42:03,024 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-14 00:42:03,024 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-14 00:42:03,024 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-14 00:42:03,024 [ scc.merge] INFO Already up to date.
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Repository: ome/scripts
2025-04-14 00:42:03,024 [ scc.merge] INFO Excluded PRs:
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-14 00:42:03,024 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-14 00:42:03,024 [ scc.merge] INFO Previously merged:
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Merged PRs:
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-14 00:42:03,024 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-14 00:42:03,024 [ scc.merge] INFO
2025-04-14 00:42:03,024 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-14 00:42:03,024 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-14 00:42:03,027 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-14 00:42:03,029 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-14 00:42:03,031 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-14 00:42:03,034 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-14 00:42:03,036 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-14 00:42:03,038 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-14 00:42:03,040 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-14 00:42:03,043 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-14 00:42:03,045 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-14 00:42:03,047 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-14 00:42:03,050 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-14 00:42:03,052 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-14 00:42:03,054 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-14 00:42:03,056 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-14 00:42:03,059 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-14 00:42:03,061 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-14 00:42:03,063 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-14 00:42:03,065 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-14 00:42:03,068 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-14 00:42:03,070 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-14 00:42:03,072 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-14 00:42:03,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-14 00:42:03,074 [ scc.git] DEBUG Calling 'git remote'
2025-04-14 00:42:03,076 [ 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 d74e387] 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 e2e964b] 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-14 00:42:50,234 [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-14 00:42:59,722 [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-14 00:43:02,227 [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-14 00:43:06,999 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-14 00:43:47,382 [ 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}
