Skipping 219 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:03:48,427 [ scc.git] DEBUG [detached HEAD e36d7b5] merge master -Dorg -Ssuccess-only
2025-05-17 01:03:48,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:03:48,427 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:03:48,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:48,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-17 01:03:49,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:49,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-17 01:03:49,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:50,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-17 01:03:50,343 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:50,558 [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-05-17 01:03:50,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:50,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-17 01:03:51,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:51,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:03:51,452 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:03:51,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:51,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-17 01:03:52,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:52,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-17 01:03:52,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:53,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-17 01:03:53,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:53,492 [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-05-17 01:03:53,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:53,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-17 01:03:54,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:54,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:03:54,394 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-17 01:03:54,394 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:03:54,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-17 01:03:54,394 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:03:54,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:03:54,397 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:03:54,400 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:03:54,400 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:03:54,403 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:03:54,406 [ scc.git] DEBUG Already up to date.
2025-05-17 01:03:54,406 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-17 01:03:55,527 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-17 01:03:55,527 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-17 01:03:55,533 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-17 01:03:55,849 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-17 01:03:55,849 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-17 01:03:55,855 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:03:55,855 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:03:55,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:03:55,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-17 01:03:55,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:03:55,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-17 01:03:55,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:03:55,897 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-17 01:03:55,897 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-17 01:03:55,897 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-17 01:03:55,897 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-17 01:03:55,897 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-17 01:03:55,897 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-17 01:03:55,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:56,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:03:56,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-17 01:03:56,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:03:56,105 [ 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-05-17 01:03:56,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:03:56,118 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-17 01:03:56,118 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-17 01:03:56,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:56,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:03:56,514 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:03:56,556 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:03:56,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:03:56,559 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:03:56,607 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:03:56,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf70705910> has no local changes
2025-05-17 01:03:56,612 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:03:56,619 [ scc.git] DEBUG [detached HEAD 19180bb] merge master -Dorg -Ssuccess-only
2025-05-17 01:03:56,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:03:56,619 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:03:56,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:57,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-17 01:03:57,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:57,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-17 01:03:57,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:58,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-17 01:03:58,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:58,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-17 01:03:58,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:59,060 [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-05-17 01:03:59,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:59,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-17 01:03:59,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:03:59,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:03:59,969 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-17 01:04:00,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:00,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-17 01:04:00,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:01,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-17 01:04:01,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:01,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-17 01:04:01,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:02,058 [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-05-17 01:04:02,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:02,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-17 01:04:02,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:03,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:03,018 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-17 01:04:03,018 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:03,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-17 01:04:03,018 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:03,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:03,021 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:03,024 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:03,024 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:03,027 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:03,035 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-17 01:04:03,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:03,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-17 01:04:03,679 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-17 01:04:04,573 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-17 01:04:04,573 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-17 01:04:04,579 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-17 01:04:05,587 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-17 01:04:05,587 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-17 01:04:05,593 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:05,593 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:05,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:05,596 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-17 01:04:05,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:05,603 [ 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-05-17 01:04:05,923 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-17 01:04:05,923 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-17 01:04:05,923 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-17 01:04:05,923 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-17 01:04:05,923 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 01:04:05,924 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 01:04:05,927 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 01:04:05,932 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-17 01:04:05,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:06,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:06,098 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-17 01:04:06,104 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 01:04:06,130 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#424](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-17 01:04:06,132 [ scc.config] DEBUG Found github.token
2025-05-17 01:04:06,132 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-17 01:04:06,133 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-17 01:04:06,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:06,140 [ 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-05-17 01:04:06,301 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-17 01:04:06,301 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-17 01:04:06,301 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-17 01:04:06,302 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 01:04:06,302 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 01:04:06,306 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 01:04:06,311 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-17 01:04:06,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:06,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:06,569 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-17 01:04:06,574 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 01:04:06,577 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#424](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/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-05-17 01:04:06,579 [ scc.config] DEBUG Found github.token
2025-05-17 01:04:06,579 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-17 01:04:06,579 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:06,621 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:06,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:06,624 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:06,664 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:06,669 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf70789a90> has no local changes
2025-05-17 01:04:06,669 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:06,677 [ scc.git] DEBUG [detached HEAD 3ee6168] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:06,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:06,677 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:06,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:07,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-17 01:04:07,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:07,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-17 01:04:07,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:08,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-17 01:04:08,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:08,700 [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-05-17 01:04:08,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:09,175 [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-05-17 01:04:09,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:09,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-17 01:04:09,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:10,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:10,130 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:04:10,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:10,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-17 01:04:10,644 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-17 01:04:10,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:11,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-17 01:04:11,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:11,736 [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-05-17 01:04:11,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:12,247 [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-05-17 01:04:12,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:12,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-17 01:04:13,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:13,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:13,277 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-17 01:04:13,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:13,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-17 01:04:13,764 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-17 01:04:14,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:14,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-17 01:04:14,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:14,862 [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-05-17 01:04:15,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:15,389 [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-05-17 01:04:15,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:15,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-17 01:04:16,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:16,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:16,403 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-17 01:04:16,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:16,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-17 01:04:17,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:17,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-17 01:04:17,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:17,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-17 01:04:18,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:18,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-17 01:04:18,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:18,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-17 01:04:19,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:19,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-17 01:04:19,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:19,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-17 01:04:19,823 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:19,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-17 01:04:19,823 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:19,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:19,826 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:19,828 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:19,828 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:19,831 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:19,834 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:19,834 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-17 01:04:20,160 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-17 01:04:20,160 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-17 01:04:20,165 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-17 01:04:20,452 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-17 01:04:20,452 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-17 01:04:20,457 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-17 01:04:20,789 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-17 01:04:20,789 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-17 01:04:20,795 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:20,795 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:20,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:20,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-17 01:04:20,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:20,852 [ 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-05-17 01:04:20,979 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:04:20,983 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-17 01:04:20,983 [ scc.git] DEBUG package.json | 2 +-
2025-05-17 01:04:20,983 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-17 01:04:20,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:21,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:21,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-17 01:04:21,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:21,193 [ 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-05-17 01:04:21,425 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-17 01:04:21,425 [ scc.git] DEBUG Auto-merging package.json
2025-05-17 01:04:21,426 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:04:21,431 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-17 01:04:21,431 [ scc.git] DEBUG package.json | 2 +-
2025-05-17 01:04:21,431 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-17 01:04:21,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:21,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:21,593 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-17 01:04:21,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:21,600 [ 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-05-17 01:04:21,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:04:21,657 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-17 01:04:21,657 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-17 01:04:21,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:22,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:22,015 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:22,057 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:22,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:22,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:22,099 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:22,104 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf709e2810> has no local changes
2025-05-17 01:04:22,105 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:22,112 [ scc.git] DEBUG [detached HEAD 140cb00] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:22,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:22,113 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:22,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:22,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-17 01:04:22,458 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:22,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-17 01:04:22,458 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:22,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:22,461 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:22,464 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:22,464 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:22,467 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:22,470 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:22,470 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:22,470 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:22,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:22,472 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:22,514 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:22,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:22,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:22,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:22,561 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf70792790> has no local changes
2025-05-17 01:04:22,562 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:22,568 [ scc.git] DEBUG [detached HEAD f932ce0] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:22,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:22,569 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:22,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:22,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-17 01:04:23,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:23,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-17 01:04:23,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:24,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-17 01:04:24,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:24,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-17 01:04:24,561 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:24,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-17 01:04:24,561 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:24,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:24,564 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:24,567 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:24,567 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:24,570 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:24,573 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:24,573 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:24,573 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:24,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:24,576 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:24,617 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:24,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:24,620 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:24,661 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:24,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d610dd0> has no local changes
2025-05-17 01:04:24,665 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:24,671 [ scc.git] DEBUG [detached HEAD 551e0ad] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:24,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:24,672 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:24,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:25,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-17 01:04:25,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:25,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-17 01:04:25,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:26,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-17 01:04:26,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:26,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-17 01:04:26,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:27,114 [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-05-17 01:04:27,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:27,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-17 01:04:27,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:28,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:28,092 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-17 01:04:28,093 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:28,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-17 01:04:28,093 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:28,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:28,096 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:28,099 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:28,099 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:28,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:28,105 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:28,106 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-17 01:04:28,619 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-17 01:04:28,619 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-17 01:04:28,625 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:28,625 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:28,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:28,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-17 01:04:28,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:28,633 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-17 01:04:28,829 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG Auto-merging setup.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-17 01:04:28,829 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 01:04:28,830 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 01:04:28,833 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-17 01:04:28,838 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-17 01:04:28,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:29,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:29,007 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-17 01:04:29,011 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-17 01:04:29,121 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#424](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2025-05-17 01:04:29,123 [ scc.config] DEBUG Found github.token
2025-05-17 01:04:29,123 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-17 01:04:29,123 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:29,164 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:29,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:29,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:29,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:29,210 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d60f150> has no local changes
2025-05-17 01:04:29,210 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:29,217 [ scc.git] DEBUG [detached HEAD 299cb16] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:29,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:29,217 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:29,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:29,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-17 01:04:29,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:30,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-17 01:04:30,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:30,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-17 01:04:30,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:31,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-17 01:04:31,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:31,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-17 01:04:31,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:32,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-17 01:04:32,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:32,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:32,556 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-17 01:04:32,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:33,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-17 01:04:33,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:33,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-17 01:04:33,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:34,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-17 01:04:34,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:34,659 [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-05-17 01:04:34,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:35,155 [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-05-17 01:04:35,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:35,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-17 01:04:35,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:36,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-17 01:04:36,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:36,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-17 01:04:36,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:37,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-17 01:04:37,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:37,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-17 01:04:37,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:38,076 [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-05-17 01:04:38,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:38,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-17 01:04:38,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:39,030 [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-05-17 01:04:39,030 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-17 01:04:39,031 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:39,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-17 01:04:39,031 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:39,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:39,034 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:39,036 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:39,037 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:39,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:39,043 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:39,043 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-17 01:04:39,690 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-17 01:04:39,690 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-17 01:04:39,695 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-17 01:04:39,969 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-17 01:04:39,969 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-17 01:04:39,974 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:39,974 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:39,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:39,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-17 01:04:39,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:39,984 [ 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-05-17 01:04:40,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:04:40,056 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-17 01:04:40,057 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-17 01:04:40,057 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-17 01:04:40,057 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-17 01:04:40,057 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-17 01:04:40,057 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-17 01:04:40,057 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-17 01:04:40,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-17 01:04:40,058 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-17 01:04:40,058 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-17 01:04:40,059 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-17 01:04:40,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:40,225 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-17 01:04:40,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:40,233 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-17 01:04:40,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:04:40,256 [ scc.git] DEBUG docker | 1 +
2025-05-17 01:04:40,256 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-17 01:04:40,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:40,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:40,643 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:40,685 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:40,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:40,688 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:40,728 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:40,733 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d612ed0> has no local changes
2025-05-17 01:04:40,734 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Generated by OMERO-plugins-push#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:40,742 [ scc.git] DEBUG [detached HEAD 66fef05] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:40,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:40,743 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:40,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:41,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-17 01:04:41,099 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:41,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-17 01:04:41,099 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:41,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:41,102 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:41,104 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:41,104 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:41,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:41,110 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:41,110 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:41,111 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:41,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:41,113 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:41,154 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:41,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:41,156 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:41,199 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:41,203 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d62b990> has no local changes
2025-05-17 01:04:41,203 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:41,209 [ scc.git] DEBUG [detached HEAD 5c718e6] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:41,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:41,210 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:41,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:41,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-17 01:04:41,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:42,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-17 01:04:42,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:42,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-17 01:04:42,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:43,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-17 01:04:43,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:43,765 [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-05-17 01:04:44,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:44,305 [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-05-17 01:04:44,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:44,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-17 01:04:45,092 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:45,268 [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-05-17 01:04:45,268 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-17 01:04:45,269 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:45,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-17 01:04:45,269 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:45,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:45,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:45,274 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:45,274 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:45,278 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:45,281 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:45,281 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-17 01:04:45,670 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-17 01:04:45,670 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-17 01:04:45,675 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:45,676 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:45,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:45,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-17 01:04:45,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:45,684 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-17 01:04:45,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:04:45,719 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-17 01:04:45,720 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-17 01:04:45,720 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-17 01:04:45,720 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-17 01:04:45,720 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-17 01:04:45,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:45,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:45,880 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:45,923 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:45,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:45,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:45,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:45,968 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d62bc50> has no local changes
2025-05-17 01:04:45,968 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:45,975 [ scc.git] DEBUG [detached HEAD d26c447] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:45,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:45,976 [ scc.git] INFO Overriding base-branch from master to main
2025-05-17 01:04:45,976 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:46,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:46,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-17 01:04:46,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:46,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-17 01:04:47,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:47,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-17 01:04:47,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:47,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-17 01:04:48,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:48,482 [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-05-17 01:04:48,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:48,952 [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-05-17 01:04:49,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:49,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-17 01:04:49,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:49,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-17 01:04:50,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:50,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-17 01:04:50,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:50,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-17 01:04:51,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:51,399 [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-05-17 01:04:51,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:51,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-17 01:04:52,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:52,363 [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-05-17 01:04:52,364 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-17 01:04:52,364 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:52,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-17 01:04:52,364 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:52,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:52,367 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-17 01:04:52,370 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:52,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-17 01:04:52,373 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-17 01:04:52,376 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:52,376 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-17 01:04:52,804 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-17 01:04:52,804 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-17 01:04:52,810 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:52,810 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:52,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:52,813 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-17 01:04:52,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:52,818 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-17 01:04:52,968 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-17 01:04:52,968 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-17 01:04:52,968 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 01:04:52,969 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 01:04:52,973 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-17 01:04:52,977 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-17 01:04:52,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:53,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:53,139 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-17 01:04:53,143 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-17 01:04:53,146 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#424](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-17 01:04:53,148 [ scc.config] DEBUG Found github.token
2025-05-17 01:04:53,148 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-17 01:04:53,148 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:53,189 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:53,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:53,192 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:53,230 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:53,234 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d5f1610> has no local changes
2025-05-17 01:04:53,234 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:53,241 [ scc.git] DEBUG [detached HEAD 39e7c60] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:53,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:53,241 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:53,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:53,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-17 01:04:53,610 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:53,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-17 01:04:53,610 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:53,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:53,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:53,616 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:53,616 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:53,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:53,622 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:53,622 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:53,622 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:53,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:53,624 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:53,666 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:53,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:53,669 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:53,711 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:53,715 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d636f10> has no local changes
2025-05-17 01:04:53,715 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:53,722 [ scc.git] DEBUG [detached HEAD 162dc0d] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:53,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:53,722 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:53,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:54,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-17 01:04:54,054 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:54,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-17 01:04:54,054 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:54,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:54,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:54,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:54,060 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:54,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:54,066 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:54,066 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:54,066 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:54,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:54,068 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:54,111 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:54,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:54,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:54,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:54,158 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf6d6a0750> has no local changes
2025-05-17 01:04:54,158 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:54,165 [ scc.git] DEBUG [detached HEAD a5aa2f0] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:54,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:54,165 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:54,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:54,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-17 01:04:54,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:55,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-17 01:04:55,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:55,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-17 01:04:55,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:56,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-17 01:04:56,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:56,586 [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-05-17 01:04:56,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:57,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-17 01:04:57,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:57,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:04:57,546 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-17 01:04:57,546 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:04:57,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-17 01:04:57,547 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:57,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:57,550 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 01:04:57,552 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:04:57,552 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 01:04:57,555 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 01:04:57,558 [ scc.git] DEBUG Already up to date.
2025-05-17 01:04:57,558 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-17 01:04:57,863 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-17 01:04:57,863 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-17 01:04:57,869 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:04:57,869 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:57,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:57,871 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-17 01:04:57,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:57,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-17 01:04:58,098 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-17 01:04:58,099 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-17 01:04:58,099 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 01:04:58,099 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 01:04:58,103 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-17 01:04:58,108 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-17 01:04:58,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:58,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:04:58,279 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-17 01:04:58,282 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-17 01:04:58,285 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#424](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-17 01:04:58,287 [ scc.config] DEBUG Found github.token
2025-05-17 01:04:58,287 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-17 01:04:58,288 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:04:58,331 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:04:58,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:04:58,335 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:04:58,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:04:58,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf7098f8d0> has no local changes
2025-05-17 01:04:58,380 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:04:58,387 [ scc.git] DEBUG [detached HEAD 395b216] merge master -Dorg -Ssuccess-only
2025-05-17 01:04:58,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:04:58,387 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-17 01:04:58,387 [ scc.repo] DEBUG ## PRs found:
2025-05-17 01:04:58,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:58,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-17 01:04:59,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:59,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-17 01:04:59,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:04:59,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-17 01:05:00,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:00,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-17 01:05:00,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:00,810 [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-05-17 01:05:01,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:01,344 [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-05-17 01:05:01,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:01,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-17 01:05:02,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:02,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:05:02,353 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-17 01:05:02,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:02,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-17 01:05:03,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:03,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-17 01:05:03,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:03,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-17 01:05:04,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:04,281 [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-05-17 01:05:04,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:04,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-17 01:05:05,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:05,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-17 01:05:05,189 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-17 01:05:05,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:05,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-17 01:05:05,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:06,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-17 01:05:06,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:06,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-17 01:05:06,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:07,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-17 01:05:07,293 [ scc.repo] DEBUG ## Branches found:
2025-05-17 01:05:07,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-17 01:05:07,293 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:05:07,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:05:07,296 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-17 01:05:07,299 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 01:05:07,299 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-17 01:05:07,302 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-17 01:05:07,310 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-17 01:05:07,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:07,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-17 01:05:07,920 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-17 01:05:08,219 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-17 01:05:08,219 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-17 01:05:08,224 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-17 01:05:08,564 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-17 01:05:08,564 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-17 01:05:08,570 [ scc.git] DEBUG ## Unique users: []
2025-05-17 01:05:08,570 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:05:08,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:05:08,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-17 01:05:08,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:05:08,580 [ 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-05-17 01:05:08,708 [ 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-05-17 01:05:08,709 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 01:05:08,709 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 01:05:08,713 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-17 01:05:08,717 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-17 01:05:08,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:08,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:08,879 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-17 01:05:08,885 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-17 01:05:08,890 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#424](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-17 01:05:08,892 [ scc.config] DEBUG Found github.token
2025-05-17 01:05:08,892 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-17 01:05:08,892 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-17 01:05:08,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:05:08,899 [ 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-05-17 01:05:08,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 01:05:08,980 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-17 01:05:08,980 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-17 01:05:09,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:09,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:09,295 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 01:05:09,337 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 01:05:09,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 01:05:09,340 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:05:09,381 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:05:09,385 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf707f50d0> has no local changes
2025-05-17 01:05:09,385 [ 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#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:05:09,392 [ scc.git] DEBUG [detached HEAD 82e15a1] merge master -Dorg -Ssuccess-only
2025-05-17 01:05:09,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:09,393 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 01:05:09,479 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-17 01:05:09,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:09,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:09,710 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-17 01:05:09,712 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-17 01:05:09,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:10,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:10,125 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-17 01:05:10,127 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-17 01:05:10,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:10,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:10,529 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-17 01:05:10,531 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-17 01:05:10,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:10,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:10,937 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-17 01:05:11,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:11,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:11,363 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-17 01:05:11,365 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-17 01:05:11,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:11,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:11,773 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-17 01:05:11,775 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-17 01:05:12,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:12,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:12,190 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-17 01:05:12,192 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-17 01:05:12,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:12,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:12,763 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-17 01:05:12,765 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-17 01:05:13,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:13,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:13,186 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-17 01:05:13,188 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-17 01:05:13,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:13,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:13,598 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-17 01:05:13,600 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-17 01:05:13,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:14,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:14,032 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-17 01:05:14,034 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-17 01:05:14,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:14,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:14,445 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-17 01:05:14,447 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-17 01:05:14,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:14,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:14,882 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-17 01:05:15,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:15,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:15,303 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-17 01:05:15,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:15,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:15,716 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-17 01:05:15,718 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-17 01:05:15,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:16,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:16,139 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-17 01:05:16,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:16,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:16,554 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-17 01:05:16,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:16,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:16,977 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-17 01:05:16,979 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-17 01:05:17,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:17,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:17,397 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-17 01:05:17,399 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-17 01:05:17,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:17,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:17,805 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-17 01:05:17,806 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-17 01:05:18,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:18,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:18,209 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-17 01:05:18,211 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-17 01:05:18,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 01:05:18,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 01:05:18,636 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-17 01:05:18,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 01:05:18,732 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbf707f7610> has local changes
2025-05-17 01:05:18,732 [ 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'
- PR 71 dominikl 'Escape slash character in image names'
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 167 dominikl 'Add extinfo command' (status: failure)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- 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 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#424 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/424/)'
2025-05-17 01:05:18,746 [ scc.git] DEBUG [detached HEAD 3bceac8] merge master -Dorg -Ssuccess-only
2025-05-17 01:05:18,746 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-17 01:05:18,747 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-17 01:05:18,747 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-17 01:05:18,747 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-17 01:05:18,747 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-17 01:05:18,747 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-17 01:05:18,747 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-17 01:05:18,747 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-17 01:05:18,747 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-17 01:05:18,747 [ scc.merge] INFO
2025-05-17 01:05:18,747 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-17 01:05:18,748 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (status: failure)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-17 01:05:18,748 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-17 01:05:18,748 [ scc.merge] INFO Previously merged:
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:05:18,748 [ scc.merge] INFO
2025-05-17 01:05:18,748 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-17 01:05:18,748 [ scc.merge] INFO
2025-05-17 01:05:18,748 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-17 01:05:18,748 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-17 01:05:18,748 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-17 01:05:18,748 [ scc.merge] INFO Previously merged:
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:05:18,748 [ scc.merge] INFO
2025-05-17 01:05:18,748 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-17 01:05:18,748 [ scc.merge] INFO
2025-05-17 01:05:18,748 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-17 01:05:18,748 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-17 01:05:18,748 [ scc.merge] INFO
2025-05-17 01:05:18,748 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-17 01:05:18,748 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-17 01:05:18,749 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-17 01:05:18,749 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-17 01:05:18,749 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,749 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-17 01:05:18,749 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,749 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-17 01:05:18,749 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,749 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-17 01:05:18,750 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-17 01:05:18,750 [ scc.merge] INFO Previously merged:
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-17 01:05:18,750 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-17 01:05:18,750 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-17 01:05:18,750 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-17 01:05:18,750 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-17 01:05:18,750 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-17 01:05:18,750 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,750 [ scc.merge] INFO
2025-05-17 01:05:18,750 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,750 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-17 01:05:18,751 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-17 01:05:18,751 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,751 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,751 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-17 01:05:18,751 [ scc.merge] INFO Already up to date.
2025-05-17 01:05:18,751 [ scc.merge] INFO
2025-05-17 01:05:18,752 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,752 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-17 01:05:18,752 [ scc.merge] INFO
2025-05-17 01:05:18,752 [ scc.merge] INFO Repository: ome/scripts
2025-05-17 01:05:18,752 [ scc.merge] INFO Excluded PRs:
2025-05-17 01:05:18,752 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-17 01:05:18,752 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-17 01:05:18,752 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-17 01:05:18,752 [ scc.merge] INFO Previously merged:
2025-05-17 01:05:18,752 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-17 01:05:18,752 [ scc.merge] INFO
2025-05-17 01:05:18,752 [ scc.merge] INFO Merged PRs:
2025-05-17 01:05:18,752 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-17 01:05:18,752 [ scc.merge] INFO
2025-05-17 01:05:18,752 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 01:05:18,752 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-17 01:05:18,752 [ scc.merge] INFO
2025-05-17 01:05:18,752 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-17 01:05:18,752 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-17 01:05:18,754 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-17 01:05:18,757 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-17 01:05:18,759 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-17 01:05:18,761 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-17 01:05:18,764 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-17 01:05:18,766 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-17 01:05:18,768 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-17 01:05:18,771 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-17 01:05:18,773 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-17 01:05:18,775 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-17 01:05:18,777 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-17 01:05:18,780 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-17 01:05:18,782 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-17 01:05:18,784 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-17 01:05:18,787 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-17 01:05:18,789 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-17 01:05:18,791 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-17 01:05:18,793 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-17 01:05:18,796 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-17 01:05:18,798 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-17 01:05:18,800 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 01:05:18,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-17 01:05:18,803 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 01:05:18,805 [ 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 2aa5d43] 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 a0bc6fb] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-17 01:06:09,397 [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-05-17 01:06:18,957 [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-05-17 01:06:21,480 [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-05-17 01:06:26,278 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-17 01:07:16,873 [ 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