Skipping 195 KB..
Full Log2025-03-27 00:50:08,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:08,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-27 00:50:09,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:09,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-27 00:50:09,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:09,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-27 00:50:10,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:10,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:10,315 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-27 00:50:10,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:10,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-27 00:50:11,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:11,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-27 00:50:11,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:11,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-27 00:50:11,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:12,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-27 00:50:12,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:12,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-27 00:50:12,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:13,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-27 00:50:13,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:13,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-27 00:50:13,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:14,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-27 00:50:14,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:14,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:14,713 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-27 00:50:14,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:15,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-27 00:50:15,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:15,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-27 00:50:15,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:16,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-27 00:50:16,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:16,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-27 00:50:17,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:17,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-27 00:50:17,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:17,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-27 00:50:17,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:18,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:18,121 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-27 00:50:18,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:18,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-27 00:50:18,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:19,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-27 00:50:19,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:19,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-27 00:50:19,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:20,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-27 00:50:20,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:20,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-27 00:50:20,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:20,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:20,981 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-27 00:50:20,981 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:20,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-27 00:50:20,982 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:20,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:20,989 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:20,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:20,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:21,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:21,006 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:21,006 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-27 00:50:21,323 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-27 00:50:21,323 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-27 00:50:21,328 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-27 00:50:21,661 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-27 00:50:21,661 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-27 00:50:21,667 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-27 00:50:21,984 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-27 00:50:21,984 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-27 00:50:21,990 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-27 00:50:22,314 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-27 00:50:22,314 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-27 00:50:22,320 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-27 00:50:22,611 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-27 00:50:22,611 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-27 00:50:22,616 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:22,616 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:22,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:22,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-27 00:50:22,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:22,636 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-27 00:50:22,652 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-27 00:50:22,652 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-27 00:50:22,653 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:22,657 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-27 00:50:22,657 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-27 00:50:22,657 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-27 00:50:22,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:22,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:22,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-27 00:50:22,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:22,832 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-27 00:50:22,856 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-27 00:50:22,856 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-27 00:50:22,856 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-27 00:50:22,856 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-27 00:50:22,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:22,862 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-27 00:50:22,862 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-27 00:50:22,862 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-27 00:50:22,862 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-27 00:50:22,862 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-27 00:50:22,862 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-27 00:50:22,862 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-27 00:50:22,862 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-27 00:50:23,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:23,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:23,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-27 00:50:23,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:23,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-27 00:50:23,268 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-27 00:50:23,269 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:23,272 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-27 00:50:23,272 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-27 00:50:23,272 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-27 00:50:23,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:23,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:23,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-27 00:50:23,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:23,677 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-27 00:50:23,696 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:23,706 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-27 00:50:23,706 [ scc.git] DEBUG package.json | 2 +-
2025-03-27 00:50:23,706 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-27 00:50:23,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:24,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:24,077 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-27 00:50:24,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:24,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-27 00:50:24,131 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-27 00:50:24,132 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-27 00:50:24,132 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:50:24,132 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:50:24,138 [ scc.git] DEBUG Calling 'git reset --hard 1720172aa05d6aae9b590370d3f8f13cac08107f'
2025-03-27 00:50:24,148 [ scc.git] DEBUG HEAD is now at 1720172 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-27 00:50:24,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:24,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:24,508 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-27 00:50:24,515 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-27 00:50:24,520 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-27 00:50:24,525 [ scc.config] DEBUG Found github.token
2025-03-27 00:50:24,525 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-27 00:50:24,525 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:24,568 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:24,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:24,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:24,613 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:24,623 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7e1b8bb0> has no local changes
2025-03-27 00:50:24,623 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
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'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:24,635 [ scc.git] DEBUG [detached HEAD a641d4d] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:24,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:24,636 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:24,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:25,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-27 00:50:25,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:25,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-27 00:50:25,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:26,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-27 00:50:26,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:26,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-27 00:50:26,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:27,103 [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-03-27 00:50:27,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:27,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-27 00:50:27,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:28,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:28,086 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-27 00:50:28,086 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:28,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-27 00:50:28,087 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:28,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:28,093 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:28,098 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:28,098 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:28,104 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:28,110 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:28,110 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-27 00:50:28,415 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-27 00:50:28,415 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-27 00:50:28,420 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:28,420 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:28,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:28,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-27 00:50:28,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:28,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-27 00:50:28,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:28,455 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-27 00:50:28,455 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-27 00:50:28,455 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-27 00:50:28,455 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-27 00:50:28,455 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-27 00:50:28,455 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-27 00:50:28,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:28,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:28,644 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:28,690 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:28,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:28,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:28,742 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:28,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7e1b8e80> has no local changes
2025-03-27 00:50:28,749 [ 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'
Generated by OMERO-plugins-push#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:28,759 [ scc.git] DEBUG [detached HEAD 0b9f929] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:28,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:28,759 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:28,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:29,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-27 00:50:29,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:29,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-27 00:50:29,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:30,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-27 00:50:30,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:30,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-27 00:50:31,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:31,265 [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-03-27 00:50:31,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:31,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-27 00:50:31,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:32,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:32,145 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-27 00:50:32,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:32,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-27 00:50:32,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:33,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-27 00:50:33,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:33,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-27 00:50:33,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:34,209 [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-03-27 00:50:34,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:34,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-27 00:50:34,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:35,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:35,097 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-27 00:50:35,097 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:35,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-27 00:50:35,097 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:35,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:35,104 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:35,109 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:35,109 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:35,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:35,121 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:35,121 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-27 00:50:35,415 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-27 00:50:35,415 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-27 00:50:35,420 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-27 00:50:35,724 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-27 00:50:35,724 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-27 00:50:35,729 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:35,729 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:35,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:35,734 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-27 00:50:35,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:35,746 [ 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-03-27 00:50:35,763 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-27 00:50:35,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-27 00:50:35,763 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-27 00:50:35,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-27 00:50:35,764 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:50:35,765 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:50:35,771 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-27 00:50:35,779 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-27 00:50:35,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:35,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:35,943 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-27 00:50:35,951 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-27 00:50:35,956 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-27 00:50:35,961 [ scc.config] DEBUG Found github.token
2025-03-27 00:50:35,961 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-27 00:50:35,961 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-27 00:50:35,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:35,975 [ 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-03-27 00:50:35,994 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-27 00:50:35,994 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-27 00:50:35,994 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-27 00:50:35,995 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:50:35,995 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:50:36,002 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-27 00:50:36,009 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-27 00:50:36,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:36,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:36,367 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-27 00:50:36,375 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-27 00:50:36,381 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/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-03-27 00:50:36,386 [ scc.config] DEBUG Found github.token
2025-03-27 00:50:36,386 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-27 00:50:36,386 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:36,431 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:36,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:36,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:36,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:36,489 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7e1653a0> has no local changes
2025-03-27 00:50:36,489 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:36,500 [ scc.git] DEBUG [detached HEAD e5d50b7] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:36,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:36,501 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:36,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:36,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-27 00:50:37,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:37,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-27 00:50:37,401 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-27 00:50:37,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:37,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-27 00:50:38,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:38,515 [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-03-27 00:50:38,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:39,051 [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-03-27 00:50:39,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:39,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-27 00:50:39,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:39,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:39,938 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-27 00:50:40,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:40,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-27 00:50:40,442 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-27 00:50:40,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:41,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-27 00:50:41,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:41,497 [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-03-27 00:50:41,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:42,075 [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-03-27 00:50:42,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:42,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-27 00:50:42,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:43,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:43,040 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-27 00:50:43,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:43,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-27 00:50:43,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:44,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-27 00:50:44,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:44,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-27 00:50:44,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:45,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-27 00:50:45,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:45,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-27 00:50:45,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:45,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-27 00:50:46,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:46,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-27 00:50:46,509 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:46,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-27 00:50:46,509 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:46,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:46,515 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:46,520 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:46,520 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:46,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:46,531 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:46,531 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-27 00:50:46,837 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-27 00:50:46,837 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-27 00:50:46,842 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-27 00:50:47,142 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-27 00:50:47,143 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-27 00:50:47,148 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:47,148 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:47,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:47,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-27 00:50:47,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:47,165 [ 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-03-27 00:50:47,176 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:47,180 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-27 00:50:47,180 [ scc.git] DEBUG package.json | 2 +-
2025-03-27 00:50:47,180 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-27 00:50:47,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:47,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:47,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-27 00:50:47,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:47,363 [ 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-03-27 00:50:47,377 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-27 00:50:47,378 [ scc.git] DEBUG Auto-merging package.json
2025-03-27 00:50:47,378 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:50:47,382 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-27 00:50:47,382 [ scc.git] DEBUG package.json | 2 +-
2025-03-27 00:50:47,382 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-27 00:50:47,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:47,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:47,760 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:47,809 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:47,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:47,815 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:47,860 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:47,869 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7e16e070> has no local changes
2025-03-27 00:50:47,869 [ 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'
Generated by OMERO-plugins-push#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:47,881 [ scc.git] DEBUG [detached HEAD c882f5e] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:47,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:47,882 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:48,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:48,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-27 00:50:48,202 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:48,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-27 00:50:48,202 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:48,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:48,209 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:48,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:48,216 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:48,222 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:48,228 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:48,229 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:48,229 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:48,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:48,234 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:48,281 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:48,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:48,287 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:48,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:48,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c0cf6a0> has no local changes
2025-03-27 00:50:48,340 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:48,350 [ scc.git] DEBUG [detached HEAD eff0039] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:48,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:48,351 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:48,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:48,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-27 00:50:48,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:49,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-27 00:50:49,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:49,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-27 00:50:49,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:50,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-27 00:50:50,228 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:50,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-27 00:50:50,229 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:50,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:50,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:50,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:50,241 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:50,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:50,252 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:50,252 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:50,252 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:50,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:50,257 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:50,300 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:50,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:50,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:50,352 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:50,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c145610> has no local changes
2025-03-27 00:50:50,359 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:50,368 [ scc.git] DEBUG [detached HEAD d4d4aec] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:50,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:50,369 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:50,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:50,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-27 00:50:51,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:51,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-27 00:50:51,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:51,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-27 00:50:51,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:52,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-27 00:50:52,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:52,794 [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-03-27 00:50:53,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:53,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-27 00:50:53,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:54,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:50:54,178 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-27 00:50:54,178 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:50:54,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-27 00:50:54,178 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:54,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:54,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:50:54,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:50:54,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:50:54,196 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:50:54,202 [ scc.git] DEBUG Already up to date.
2025-03-27 00:50:54,202 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-27 00:50:54,513 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-27 00:50:54,514 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-27 00:50:54,519 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:50:54,519 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:54,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:54,525 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-27 00:50:54,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:54,537 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-27 00:50:54,550 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG Auto-merging setup.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-27 00:50:54,550 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:50:54,550 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:50:54,556 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-27 00:50:54,563 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-27 00:50:54,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:54,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:50:54,731 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-27 00:50:54,739 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-27 00:50:54,746 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-03-27 00:50:54,752 [ scc.config] DEBUG Found github.token
2025-03-27 00:50:54,752 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-27 00:50:54,752 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:50:54,797 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:50:54,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:50:54,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:50:54,847 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:50:54,854 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7e1928e0> has no local changes
2025-03-27 00:50:54,854 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:50:54,863 [ scc.git] DEBUG [detached HEAD 1779e96] merge master -Dorg -Ssuccess-only
2025-03-27 00:50:54,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:50:54,864 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:50:54,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:55,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-27 00:50:55,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:55,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-27 00:50:56,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:56,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-27 00:50:56,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:56,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-27 00:50:57,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:57,326 [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-03-27 00:50:57,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:57,797 [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-03-27 00:50:58,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:58,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-27 00:50:58,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:58,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-27 00:50:59,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:59,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-27 00:50:59,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:50:59,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-27 00:50:59,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:00,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-27 00:51:00,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:00,718 [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-03-27 00:51:00,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:01,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-27 00:51:01,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:01,666 [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-03-27 00:51:01,667 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-27 00:51:01,667 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:01,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-27 00:51:01,668 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:01,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:01,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:51:01,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:01,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:51:01,684 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:51:01,690 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:01,691 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-27 00:51:02,040 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-27 00:51:02,041 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-27 00:51:02,046 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:02,046 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:02,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:02,051 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-27 00:51:02,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:02,063 [ 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-03-27 00:51:02,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-27 00:51:02,083 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-27 00:51:02,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-27 00:51:02,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-27 00:51:02,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-27 00:51:02,087 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-27 00:51:02,087 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-27 00:51:02,087 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-27 00:51:02,088 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-27 00:51:02,088 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-27 00:51:02,088 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-27 00:51:02,088 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-27 00:51:02,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:02,266 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:02,311 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:02,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:02,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:02,365 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:02,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c0c5400> has no local changes
2025-03-27 00:51:02,373 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:02,385 [ scc.git] DEBUG [detached HEAD bac1faf] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:02,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:02,385 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:02,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:02,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-27 00:51:02,729 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:02,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-27 00:51:02,730 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:02,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:02,737 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:51:02,743 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:02,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:51:02,750 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:51:02,756 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:02,756 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:02,756 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:02,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:02,761 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:02,805 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:02,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:02,811 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:02,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:02,862 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c13c790> has no local changes
2025-03-27 00:51:02,862 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:02,872 [ scc.git] DEBUG [detached HEAD 47339d7] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:02,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:02,873 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:02,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:03,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-27 00:51:03,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:03,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-27 00:51:03,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:04,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-27 00:51:04,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:04,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-27 00:51:05,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:05,309 [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-03-27 00:51:05,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:05,762 [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-03-27 00:51:06,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:06,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-27 00:51:06,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:06,751 [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-03-27 00:51:06,751 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-27 00:51:06,751 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:06,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-27 00:51:06,752 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:06,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:06,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:51:06,763 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:06,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:51:06,768 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:51:06,774 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:06,774 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-27 00:51:07,068 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-27 00:51:07,068 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-27 00:51:07,072 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:07,072 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:07,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:07,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-27 00:51:07,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:07,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-27 00:51:07,099 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:51:07,102 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-27 00:51:07,102 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-27 00:51:07,102 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-27 00:51:07,102 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-27 00:51:07,102 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-27 00:51:07,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:07,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:07,277 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:07,329 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:07,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:07,335 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:07,380 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:07,387 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c0794f0> has no local changes
2025-03-27 00:51:07,387 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:07,396 [ scc.git] DEBUG [detached HEAD 7e1f268] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:07,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:07,397 [ scc.git] INFO Overriding base-branch from master to main
2025-03-27 00:51:07,397 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:07,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:07,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-27 00:51:08,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:08,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-27 00:51:08,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:08,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-27 00:51:09,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:09,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-27 00:51:09,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:09,836 [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-03-27 00:51:10,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:10,367 [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-03-27 00:51:10,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:10,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-27 00:51:11,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:11,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-27 00:51:11,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:11,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-27 00:51:12,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:12,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-27 00:51:12,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:12,909 [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-03-27 00:51:13,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:13,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-27 00:51:13,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:13,993 [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-03-27 00:51:13,994 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-27 00:51:13,994 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:13,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-27 00:51:13,995 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:13,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:14,001 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-27 00:51:14,006 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:14,006 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-27 00:51:14,011 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-27 00:51:14,017 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:14,017 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-27 00:51:14,324 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-27 00:51:14,324 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-27 00:51:14,329 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:14,329 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:14,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:14,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-27 00:51:14,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:14,348 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-27 00:51:14,360 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-27 00:51:14,360 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-27 00:51:14,360 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:51:14,360 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:51:14,366 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-27 00:51:14,374 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-27 00:51:14,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:14,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:14,548 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-27 00:51:14,555 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-27 00:51:14,562 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-27 00:51:14,567 [ scc.config] DEBUG Found github.token
2025-03-27 00:51:14,567 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-27 00:51:14,568 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:14,614 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:14,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:14,620 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:14,668 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:14,675 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c095f10> has no local changes
2025-03-27 00:51:14,675 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:14,685 [ scc.git] DEBUG [detached HEAD 07ccfba] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:14,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:14,686 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:14,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:14,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-27 00:51:14,981 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:14,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-27 00:51:14,981 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:14,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:14,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:51:14,994 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:14,994 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:51:15,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:51:15,007 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:15,007 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:15,007 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:15,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:15,013 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:15,061 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:15,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:15,067 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:15,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:15,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c0d28e0> has no local changes
2025-03-27 00:51:15,123 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:15,132 [ scc.git] DEBUG [detached HEAD 7332fcf] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:15,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:15,133 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:15,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:15,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-27 00:51:15,433 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:15,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-27 00:51:15,433 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:15,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:15,440 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:51:15,445 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:15,445 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:51:15,451 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:51:15,458 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:15,458 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:15,458 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:15,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:15,463 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:15,511 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:15,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:15,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:15,565 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:15,573 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c095d60> has no local changes
2025-03-27 00:51:15,573 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:15,584 [ scc.git] DEBUG [detached HEAD ce0089c] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:15,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:15,585 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:15,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:15,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-27 00:51:16,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:16,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-27 00:51:16,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:16,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-27 00:51:17,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:17,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-27 00:51:17,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:17,907 [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-03-27 00:51:18,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:18,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-27 00:51:18,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:18,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:51:18,898 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-27 00:51:18,898 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:18,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-27 00:51:18,898 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:18,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:18,904 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-27 00:51:18,910 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:18,910 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-27 00:51:18,916 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-27 00:51:18,922 [ scc.git] DEBUG Already up to date.
2025-03-27 00:51:18,923 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-27 00:51:19,222 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-27 00:51:19,222 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-27 00:51:19,227 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:19,227 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:19,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:19,232 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-27 00:51:19,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:19,243 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-27 00:51:19,254 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-27 00:51:19,254 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-27 00:51:19,254 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:51:19,255 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:51:19,260 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-27 00:51:19,267 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-27 00:51:19,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:19,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:19,443 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-27 00:51:19,450 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-27 00:51:19,456 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-27 00:51:19,461 [ scc.config] DEBUG Found github.token
2025-03-27 00:51:19,462 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-27 00:51:19,462 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:19,509 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:19,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:19,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:19,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:19,566 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c05ca60> has no local changes
2025-03-27 00:51:19,566 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:19,575 [ scc.git] DEBUG [detached HEAD 99f0fec] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:19,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:19,575 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-27 00:51:19,575 [ scc.repo] DEBUG ## PRs found:
2025-03-27 00:51:19,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:20,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-27 00:51:20,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:20,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-27 00:51:20,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:20,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-27 00:51:21,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:21,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-27 00:51:21,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:21,887 [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-03-27 00:51:22,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:22,362 [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-03-27 00:51:22,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:22,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-27 00:51:23,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:23,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:51:23,350 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-27 00:51:23,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:23,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-27 00:51:24,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:24,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-27 00:51:24,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:24,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-27 00:51:25,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:25,302 [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-03-27 00:51:25,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:25,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-27 00:51:26,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:26,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-27 00:51:26,192 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-27 00:51:26,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:26,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-27 00:51:26,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:27,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-27 00:51:27,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:27,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-27 00:51:27,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:28,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-27 00:51:28,227 [ scc.repo] DEBUG ## Branches found:
2025-03-27 00:51:28,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-27 00:51:28,227 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:28,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:28,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-27 00:51:28,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-27 00:51:28,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-27 00:51:28,245 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-27 00:51:28,255 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-27 00:51:28,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:28,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-27 00:51:28,872 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-27 00:51:29,276 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-27 00:51:29,276 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-27 00:51:29,281 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-27 00:51:29,590 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-27 00:51:29,590 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-27 00:51:29,595 [ scc.git] DEBUG ## Unique users: []
2025-03-27 00:51:29,596 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:29,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:29,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-27 00:51:29,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:29,616 [ 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-03-27 00:51:29,630 [ 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-03-27 00:51:29,630 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-27 00:51:29,631 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-27 00:51:29,637 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-27 00:51:29,643 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-27 00:51:29,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:29,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:29,820 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-27 00:51:29,829 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-27 00:51:29,837 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#368](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-27 00:51:29,843 [ scc.config] DEBUG Found github.token
2025-03-27 00:51:29,843 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-27 00:51:29,843 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-27 00:51:29,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:29,855 [ 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-03-27 00:51:29,867 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-27 00:51:29,870 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-27 00:51:29,870 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-27 00:51:30,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:30,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:30,234 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-27 00:51:30,278 [ scc.git] DEBUG Get sha1 of %s
2025-03-27 00:51:30,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-27 00:51:30,285 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:30,328 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:30,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7c0b0fd0> has no local changes
2025-03-27 00:51:30,336 [ 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#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:30,344 [ scc.git] DEBUG [detached HEAD 74d83ab] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:30,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:30,345 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-27 00:51:30,430 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-27 00:51:30,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:30,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:30,676 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-27 00:51:30,681 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-27 00:51:30,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:31,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:31,089 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-27 00:51:31,094 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-27 00:51:31,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:31,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:31,513 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-27 00:51:31,518 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-27 00:51:31,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:31,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:31,933 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-27 00:51:32,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:32,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:32,389 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-27 00:51:32,394 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-27 00:51:32,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:32,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:32,819 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-27 00:51:32,824 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-27 00:51:33,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:33,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:33,246 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-27 00:51:33,251 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-27 00:51:33,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:33,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:33,662 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-27 00:51:33,667 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-27 00:51:33,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:34,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:34,080 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-27 00:51:34,085 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-27 00:51:34,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:34,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:34,502 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-27 00:51:34,507 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-27 00:51:34,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:34,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:34,926 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-27 00:51:34,931 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-27 00:51:35,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:35,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:35,337 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-27 00:51:35,341 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-27 00:51:35,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:35,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:35,748 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-27 00:51:35,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:36,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:36,165 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-27 00:51:36,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:36,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:36,605 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-27 00:51:36,611 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-27 00:51:36,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:37,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:37,023 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-27 00:51:37,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:37,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:37,444 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-27 00:51:37,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:37,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:37,864 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-27 00:51:37,869 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-27 00:51:38,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:38,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:38,274 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-27 00:51:38,278 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-27 00:51:38,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:38,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:38,691 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-27 00:51:38,696 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-27 00:51:38,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:39,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:39,120 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-27 00:51:39,125 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-27 00:51:39,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-27 00:51:39,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-27 00:51:39,545 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-27 00:51:39,545 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-27 00:51:39,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b7f28bfd0> has local changes
2025-03-27 00:51:39,641 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 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])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
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)
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'
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'
Repository: ome/omero-metadata
Already up to date.
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'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#368 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/368/)'
2025-03-27 00:51:39,657 [ scc.git] DEBUG [detached HEAD 6c6769a] merge master -Dorg -Ssuccess-only
2025-03-27 00:51:39,657 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-27 00:51:39,657 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-27 00:51:39,658 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-27 00:51:39,658 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-27 00:51:39,658 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-27 00:51:39,658 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-27 00:51:39,658 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-27 00:51:39,658 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,658 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-27 00:51:39,658 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-27 00:51:39,658 [ scc.merge] INFO
2025-03-27 00:51:39,659 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-27 00:51:39,659 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-27 00:51:39,659 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,659 [ scc.merge] INFO
2025-03-27 00:51:39,659 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-27 00:51:39,659 [ scc.merge] INFO
2025-03-27 00:51:39,659 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-27 00:51:39,659 [ scc.merge] INFO
2025-03-27 00:51:39,659 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-27 00:51:39,659 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-27 00:51:39,659 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,659 [ scc.merge] INFO
2025-03-27 00:51:39,659 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-03-27 00:51:39,659 [ scc.merge] INFO
2025-03-27 00:51:39,659 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,659 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-27 00:51:39,659 [ scc.merge] INFO
2025-03-27 00:51:39,660 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-27 00:51:39,660 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,660 [ scc.merge] INFO
2025-03-27 00:51:39,660 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-27 00:51:39,660 [ scc.merge] INFO
2025-03-27 00:51:39,660 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-27 00:51:39,660 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,660 [ scc.merge] INFO
2025-03-27 00:51:39,660 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-27 00:51:39,660 [ scc.merge] INFO
2025-03-27 00:51:39,660 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-27 00:51:39,660 [ scc.merge] INFO
2025-03-27 00:51:39,660 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-27 00:51:39,660 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-27 00:51:39,660 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-27 00:51:39,660 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,660 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-27 00:51:39,661 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-27 00:51:39,661 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-27 00:51:39,661 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-27 00:51:39,661 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,661 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-27 00:51:39,661 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-27 00:51:39,661 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,661 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-27 00:51:39,661 [ scc.merge] INFO
2025-03-27 00:51:39,661 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-27 00:51:39,661 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-27 00:51:39,661 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-27 00:51:39,662 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-27 00:51:39,662 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-27 00:51:39,662 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-27 00:51:39,662 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-27 00:51:39,662 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,662 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-27 00:51:39,662 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-27 00:51:39,662 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-27 00:51:39,662 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,662 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,663 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-27 00:51:39,663 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-27 00:51:39,663 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,663 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-27 00:51:39,663 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,663 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-27 00:51:39,663 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-27 00:51:39,663 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,663 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-27 00:51:39,663 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-27 00:51:39,663 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO
2025-03-27 00:51:39,663 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-27 00:51:39,664 [ scc.merge] INFO Already up to date.
2025-03-27 00:51:39,664 [ scc.merge] INFO
2025-03-27 00:51:39,664 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,664 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-27 00:51:39,664 [ scc.merge] INFO
2025-03-27 00:51:39,664 [ scc.merge] INFO Repository: ome/scripts
2025-03-27 00:51:39,664 [ scc.merge] INFO Excluded PRs:
2025-03-27 00:51:39,664 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-27 00:51:39,664 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-27 00:51:39,664 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-27 00:51:39,664 [ scc.merge] INFO Previously merged:
2025-03-27 00:51:39,664 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-27 00:51:39,664 [ scc.merge] INFO
2025-03-27 00:51:39,664 [ scc.merge] INFO Merged PRs:
2025-03-27 00:51:39,664 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-27 00:51:39,664 [ scc.merge] INFO
2025-03-27 00:51:39,664 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-27 00:51:39,664 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-27 00:51:39,664 [ scc.merge] INFO
2025-03-27 00:51:39,664 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-27 00:51:39,664 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-27 00:51:39,669 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-27 00:51:39,674 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-27 00:51:39,679 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-27 00:51:39,684 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-27 00:51:39,689 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-27 00:51:39,694 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-27 00:51:39,698 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-27 00:51:39,703 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-27 00:51:39,708 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-27 00:51:39,713 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-27 00:51:39,718 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-27 00:51:39,723 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-27 00:51:39,727 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-27 00:51:39,732 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-27 00:51:39,737 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-27 00:51:39,742 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-27 00:51:39,747 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-27 00:51:39,752 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-27 00:51:39,757 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-27 00:51:39,761 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-27 00:51:39,766 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-27 00:51:39,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-27 00:51:39,771 [ scc.git] DEBUG Calling 'git remote'
2025-03-27 00:51:39,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/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
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: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: 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.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/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
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
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: 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
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: 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.2-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 b030c48] 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 f4bfce6] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-27 00:52:26,980 [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-03-27 00:52:36,462 [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-03-27 00:52:38,982 [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-03-27 00:52:43,774 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-27 00:53:25,813 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/f8f0d1dd/images/svgs/logo.svg){kind=logo}
