Skipping 194 KB..
Full Log2025-03-20 22:46:11,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:12,199 [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-20 22:46:12,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:12,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-20 22:46:12,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:13,135 [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-20 22:46:13,136 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-20 22:46:13,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:13,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-20 22:46:13,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:14,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-20 22:46:14,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:14,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-20 22:46:14,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:15,227 [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-20 22:46:15,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:15,825 [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-20 22:46:16,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:16,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-20 22:46:16,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:16,755 [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-20 22:46:16,756 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-20 22:46:17,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:17,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-20 22:46:17,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:17,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-20 22:46:17,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:18,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-20 22:46:18,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:18,729 [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-20 22:46:18,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:19,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-20 22:46:19,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:19,610 [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-20 22:46:19,610 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-20 22:46:19,611 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:19,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-20 22:46:19,612 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:19,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:19,618 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:19,624 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:19,625 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:19,631 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:19,637 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:19,638 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-20 22:46:19,971 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 22:46:19,971 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-20 22:46:19,977 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-20 22:46:20,297 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 22:46:20,297 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-20 22:46:20,302 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-20 22:46:20,603 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 22:46:20,603 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-20 22:46:20,608 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-20 22:46:20,892 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 22:46:20,892 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-20 22:46:20,897 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-20 22:46:21,234 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 22:46:21,235 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-20 22:46:21,240 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:21,240 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:21,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:21,246 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-20 22:46:21,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:21,260 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-20 22:46:21,275 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-20 22:46:21,275 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-20 22:46:21,276 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:21,279 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-20 22:46:21,279 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-20 22:46:21,279 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-20 22:46:21,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:21,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:21,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-20 22:46:21,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:21,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-20 22:46:21,483 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-20 22:46:21,484 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-20 22:46:21,484 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-20 22:46:21,484 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-20 22:46:21,485 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:21,491 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-20 22:46:21,491 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-20 22:46:21,491 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-20 22:46:21,491 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-20 22:46:21,491 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-20 22:46:21,491 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-20 22:46:21,491 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-20 22:46:21,491 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-20 22:46:21,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:21,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:21,861 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-20 22:46:21,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:21,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-20 22:46:21,893 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-20 22:46:21,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:21,896 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-20 22:46:21,896 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-20 22:46:21,896 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-20 22:46:22,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:22,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:22,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-20 22:46:22,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:22,300 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-20 22:46:22,323 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:22,334 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-20 22:46:22,335 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 22:46:22,335 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-20 22:46:22,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:22,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:22,699 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 22:46:22,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:22,718 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 22:46:22,761 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-20 22:46:22,761 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-20 22:46:22,762 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:46:22,762 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:46:22,770 [ scc.git] DEBUG Calling 'git reset --hard 1a2f7757fa15e378aa7b5dfdd6bff2a302ecc566'
2025-03-20 22:46:22,783 [ scc.git] DEBUG HEAD is now at 1a2f775 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-20 22:46:22,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:23,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:23,114 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 22:46:23,122 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-20 22:46:23,131 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-20 22:46:23,139 [ scc.config] DEBUG Found github.token
2025-03-20 22:46:23,139 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-20 22:46:23,140 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:23,206 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:23,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:23,229 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:23,279 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:23,298 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00745520> has no local changes
2025-03-20 22:46:23,299 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:23,496 [ scc.git] DEBUG [detached HEAD dcd3dbf] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:23,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:23,496 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:23,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:23,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-20 22:46:24,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:24,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-20 22:46:24,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:24,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-20 22:46:25,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:25,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-20 22:46:25,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:25,881 [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-20 22:46:26,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:26,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-20 22:46:26,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:26,830 [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-20 22:46:26,830 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-20 22:46:26,831 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:26,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-20 22:46:26,831 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:26,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:26,838 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:26,844 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:26,844 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:26,851 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:26,860 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:26,860 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-20 22:46:27,164 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-20 22:46:27,164 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-20 22:46:27,169 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:27,169 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:27,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:27,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-20 22:46:27,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:27,191 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-20 22:46:27,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:27,205 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-20 22:46:27,205 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-20 22:46:27,205 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-20 22:46:27,206 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-20 22:46:27,206 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-20 22:46:27,206 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-20 22:46:27,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:27,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:27,372 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:27,426 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:27,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:27,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:27,478 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:27,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d007beaf0> has no local changes
2025-03-20 22:46:27,485 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:28,443 [ scc.git] DEBUG [detached HEAD 0dd0471] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:28,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:28,444 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:28,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:28,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-20 22:46:28,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:29,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-20 22:46:29,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:29,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-20 22:46:30,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:30,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-20 22:46:30,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:30,876 [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-20 22:46:31,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:31,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-20 22:46:31,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:31,876 [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-20 22:46:31,877 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-20 22:46:32,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:32,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-20 22:46:32,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:32,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-20 22:46:33,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:33,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-20 22:46:33,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:33,810 [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-20 22:46:34,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:34,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-20 22:46:34,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:34,721 [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-20 22:46:34,721 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-20 22:46:34,722 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:34,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-20 22:46:34,722 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:34,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:34,729 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:34,734 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:34,734 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:34,740 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:34,746 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:34,746 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-20 22:46:35,126 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-20 22:46:35,126 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-20 22:46:35,131 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-20 22:46:35,440 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-20 22:46:35,440 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-20 22:46:35,445 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:35,445 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:35,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:35,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-20 22:46:35,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:35,462 [ 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-20 22:46:35,476 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-20 22:46:35,477 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-20 22:46:35,477 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-20 22:46:35,477 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-20 22:46:35,477 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:46:35,478 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:46:35,484 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 22:46:35,490 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-20 22:46:35,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:35,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:35,660 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-20 22:46:35,668 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 22:46:35,675 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-20 22:46:35,680 [ scc.config] DEBUG Found github.token
2025-03-20 22:46:35,680 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-20 22:46:35,680 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-20 22:46:35,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:35,693 [ 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-20 22:46:35,711 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-20 22:46:35,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-20 22:46:35,711 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-20 22:46:35,711 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:46:35,711 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:46:35,718 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 22:46:35,726 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-20 22:46:35,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:36,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:36,082 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-20 22:46:36,090 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 22:46:36,096 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/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-20 22:46:36,101 [ scc.config] DEBUG Found github.token
2025-03-20 22:46:36,101 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-20 22:46:36,102 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:36,141 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:36,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:36,147 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:36,186 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:36,194 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00779a90> has no local changes
2025-03-20 22:46:36,194 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:36,208 [ scc.git] DEBUG [detached HEAD 3c611db] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:36,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:36,209 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:36,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:36,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-20 22:46:36,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:37,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-20 22:46:37,161 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 22:46:37,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:37,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-20 22:46:38,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:38,253 [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-20 22:46:38,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:38,759 [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-20 22:46:39,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:39,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-20 22:46:39,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:39,767 [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-20 22:46:39,768 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-20 22:46:40,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:40,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-20 22:46:40,266 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 22:46:40,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:40,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-20 22:46:41,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:41,331 [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-20 22:46:41,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:41,862 [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-20 22:46:42,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:42,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-20 22:46:42,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:42,822 [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-20 22:46:42,823 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-20 22:46:43,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:43,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-20 22:46:43,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:43,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-20 22:46:44,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:44,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-20 22:46:44,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:44,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-20 22:46:45,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:45,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-20 22:46:45,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:45,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-20 22:46:46,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:46,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-20 22:46:46,400 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:46,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-20 22:46:46,401 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:46,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:46,407 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:46,414 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:46,415 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:46,423 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:46,431 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:46,431 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-20 22:46:46,745 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-20 22:46:46,746 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-20 22:46:46,751 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-20 22:46:47,051 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-20 22:46:47,051 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-20 22:46:47,057 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:47,057 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:47,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:47,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-20 22:46:47,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:47,077 [ 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-20 22:46:47,089 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:47,093 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-20 22:46:47,093 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 22:46:47,093 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-20 22:46:47,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:47,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:47,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-20 22:46:47,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:47,300 [ 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-20 22:46:47,316 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-20 22:46:47,316 [ scc.git] DEBUG Auto-merging package.json
2025-03-20 22:46:47,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:46:47,320 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-20 22:46:47,320 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 22:46:47,320 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-20 22:46:47,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:47,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:47,720 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:47,763 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:47,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:47,770 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:47,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:47,821 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00791880> has no local changes
2025-03-20 22:46:47,821 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:47,831 [ scc.git] DEBUG [detached HEAD 8d0e7ad] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:47,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:47,832 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:47,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:48,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-20 22:46:48,156 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:48,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-20 22:46:48,156 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:48,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:48,162 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:48,168 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:48,168 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:48,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:48,183 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:48,183 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:48,184 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:48,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:48,192 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:48,240 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:48,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:48,247 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:48,300 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:48,309 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d0077b220> has no local changes
2025-03-20 22:46:48,310 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:48,321 [ scc.git] DEBUG [detached HEAD eae8b6d] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:48,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:48,322 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:48,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:48,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-20 22:46:48,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:49,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-20 22:46:49,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:49,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-20 22:46:49,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:50,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-20 22:46:50,192 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:50,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-20 22:46:50,192 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:50,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:50,198 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:50,204 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:50,204 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:50,209 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:50,214 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:50,214 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:50,214 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:50,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:50,219 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:50,257 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:50,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:50,262 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:50,300 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:50,307 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00779fa0> has no local changes
2025-03-20 22:46:50,307 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:50,315 [ scc.git] DEBUG [detached HEAD 6875989] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:50,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:50,315 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:50,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:50,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-20 22:46:50,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:51,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-20 22:46:51,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:51,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-20 22:46:51,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:52,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-20 22:46:52,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:52,681 [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-20 22:46:52,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:53,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-20 22:46:53,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:53,679 [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-20 22:46:53,680 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-20 22:46:53,680 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:46:53,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-20 22:46:53,680 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:53,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:53,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:46:53,692 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:46:53,693 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:46:53,699 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:46:53,704 [ scc.git] DEBUG Already up to date.
2025-03-20 22:46:53,705 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-20 22:46:54,017 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-20 22:46:54,018 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-20 22:46:54,023 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:46:54,023 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:54,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:54,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 22:46:54,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:54,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 22:46:54,051 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG Auto-merging setup.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-20 22:46:54,051 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:46:54,051 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:46:54,057 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-20 22:46:54,063 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-20 22:46:54,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:54,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:46:54,234 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 22:46:54,241 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-20 22:46:54,248 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-03-20 22:46:54,254 [ scc.config] DEBUG Found github.token
2025-03-20 22:46:54,254 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-20 22:46:54,255 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:46:54,299 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:46:54,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:46:54,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:46:54,347 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:46:54,354 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d0074dfd0> has no local changes
2025-03-20 22:46:54,355 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:46:54,364 [ scc.git] DEBUG [detached HEAD a3df8f5] merge master -Dorg -Ssuccess-only
2025-03-20 22:46:54,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:46:54,364 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:46:54,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:54,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-20 22:46:55,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:55,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-20 22:46:55,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:55,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-20 22:46:56,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:56,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-20 22:46:56,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:56,796 [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-20 22:46:57,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:57,305 [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-20 22:46:57,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:57,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-20 22:46:58,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:58,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-20 22:46:58,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:58,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-20 22:46:58,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:59,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-20 22:46:59,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:46:59,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-20 22:46:59,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:00,215 [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-20 22:47:00,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:00,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-20 22:47:01,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:01,234 [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-20 22:47:01,235 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-20 22:47:01,235 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:01,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-20 22:47:01,235 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:01,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:01,242 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:47:01,248 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:01,249 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:47:01,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:47:01,261 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:01,262 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-20 22:47:01,590 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-20 22:47:01,590 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-20 22:47:01,596 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:01,596 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:01,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:01,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-20 22:47:01,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:01,616 [ 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-20 22:47:01,632 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-20 22:47:01,636 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-20 22:47:01,638 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-20 22:47:01,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-20 22:47:01,640 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-20 22:47:01,640 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-20 22:47:01,640 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-20 22:47:01,641 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-20 22:47:01,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:01,823 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:01,870 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:01,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:01,877 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:01,923 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:01,932 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00779d90> has no local changes
2025-03-20 22:47:01,932 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:01,944 [ scc.git] DEBUG [detached HEAD f9412e7] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:01,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:01,944 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:02,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:02,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-20 22:47:02,273 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:02,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-20 22:47:02,273 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:02,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:02,279 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:47:02,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:02,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:47:02,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:47:02,295 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:02,296 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:02,296 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:02,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:02,300 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:02,339 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:02,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:02,345 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:02,383 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:02,389 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d006f6580> has no local changes
2025-03-20 22:47:02,389 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:02,400 [ scc.git] DEBUG [detached HEAD 23c41cc] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:02,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:02,401 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:02,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:02,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-20 22:47:03,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:03,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-20 22:47:03,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:03,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-20 22:47:04,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:04,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-20 22:47:04,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:04,859 [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-20 22:47:05,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:05,350 [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-20 22:47:05,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:05,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-20 22:47:06,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:06,273 [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-20 22:47:06,274 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-20 22:47:06,274 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:06,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-20 22:47:06,274 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:06,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:06,282 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:47:06,288 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:06,288 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:47:06,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:47:06,301 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:06,301 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-20 22:47:06,629 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-20 22:47:06,629 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-20 22:47:06,634 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:06,634 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:06,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:06,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-20 22:47:06,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:06,651 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-20 22:47:06,662 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:47:06,664 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-20 22:47:06,665 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-20 22:47:06,665 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-20 22:47:06,665 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-20 22:47:06,665 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-20 22:47:06,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:06,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:06,840 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:06,880 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:06,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:06,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:06,925 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:06,931 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00779d60> has no local changes
2025-03-20 22:47:06,932 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:06,940 [ scc.git] DEBUG [detached HEAD 8c6530d] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:06,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:06,940 [ scc.git] INFO Overriding base-branch from master to main
2025-03-20 22:47:06,940 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:07,092 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:07,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-20 22:47:07,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:07,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-20 22:47:08,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:08,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-20 22:47:08,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:08,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-20 22:47:09,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:09,484 [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-20 22:47:09,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:09,958 [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-20 22:47:10,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:10,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-20 22:47:10,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:10,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-20 22:47:11,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:11,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-20 22:47:11,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:11,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-20 22:47:12,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:12,391 [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-20 22:47:12,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:12,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-20 22:47:13,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:13,321 [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-20 22:47:13,322 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-20 22:47:13,322 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:13,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-20 22:47:13,322 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:13,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:13,329 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-20 22:47:13,335 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:13,335 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-20 22:47:13,341 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-20 22:47:13,348 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:13,349 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-20 22:47:13,652 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-20 22:47:13,652 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-20 22:47:13,657 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:13,657 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:13,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:13,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 22:47:13,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:13,677 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 22:47:13,687 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-20 22:47:13,687 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:47:13,688 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-20 22:47:13,688 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:47:13,694 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-20 22:47:13,700 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-20 22:47:13,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:13,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:13,869 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 22:47:13,875 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-20 22:47:13,882 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-20 22:47:13,888 [ scc.config] DEBUG Found github.token
2025-03-20 22:47:13,889 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-20 22:47:13,889 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:13,936 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:13,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:13,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:13,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:13,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00709100> has no local changes
2025-03-20 22:47:13,997 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:14,006 [ scc.git] DEBUG [detached HEAD fa714d1] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:14,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:14,006 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:14,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:14,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-20 22:47:14,313 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:14,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-20 22:47:14,313 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:14,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:14,321 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:47:14,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:14,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:47:14,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:47:14,347 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:14,347 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:14,347 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:14,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:14,353 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:14,396 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:14,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:14,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:14,442 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:14,448 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d006285b0> has no local changes
2025-03-20 22:47:14,448 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:14,457 [ scc.git] DEBUG [detached HEAD e15f6b9] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:14,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:14,457 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:14,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:14,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-20 22:47:14,751 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:14,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-20 22:47:14,751 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:14,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:14,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:47:14,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:14,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:47:14,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:47:14,778 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:14,778 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:14,778 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:14,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:14,784 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:14,824 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:14,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:14,830 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:14,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:14,874 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00700520> has no local changes
2025-03-20 22:47:14,875 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:14,883 [ scc.git] DEBUG [detached HEAD c97248e] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:14,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:14,883 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:15,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:15,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-20 22:47:15,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:15,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-20 22:47:16,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:16,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-20 22:47:16,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:16,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-20 22:47:17,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:17,423 [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-20 22:47:17,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:17,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-20 22:47:18,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:18,308 [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-20 22:47:18,308 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-20 22:47:18,308 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:18,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-20 22:47:18,309 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:18,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:18,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 22:47:18,320 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:18,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 22:47:18,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 22:47:18,335 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:18,335 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-20 22:47:18,660 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-20 22:47:18,660 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-20 22:47:18,665 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:18,665 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:18,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:18,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 22:47:18,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:18,680 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 22:47:18,691 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-20 22:47:18,691 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-20 22:47:18,691 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:47:18,691 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:47:18,697 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-20 22:47:18,704 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-20 22:47:18,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:18,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:18,875 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 22:47:18,882 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-20 22:47:18,888 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-20 22:47:18,892 [ scc.config] DEBUG Found github.token
2025-03-20 22:47:18,893 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-20 22:47:18,893 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:18,932 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:18,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:18,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:18,975 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:18,982 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00628610> has no local changes
2025-03-20 22:47:18,983 [ 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#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:18,992 [ scc.git] DEBUG [detached HEAD cc8ae63] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:18,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:18,993 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-20 22:47:18,993 [ scc.repo] DEBUG ## PRs found:
2025-03-20 22:47:19,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:19,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-20 22:47:19,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:19,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/225 HTTP/1.1" 200 None
2025-03-20 22:47:20,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:20,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/225/comments HTTP/1.1" 200 None
2025-03-20 22:47:20,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:20,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/71c6324c4f112dca70d14b0f97390ce6bcdac9f1 HTTP/1.1" 200 None
2025-03-20 22:47:21,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:21,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/71c6324c4f112dca70d14b0f97390ce6bcdac9f1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-20 22:47:21,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:21,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/71c6324c4f112dca70d14b0f97390ce6bcdac9f1/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-20 22:47:22,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:22,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/71c6324c4f112dca70d14b0f97390ce6bcdac9f1 HTTP/1.1" 200 None
2025-03-20 22:47:22,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:22,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/71c6324c4f112dca70d14b0f97390ce6bcdac9f1?per_page=1 HTTP/1.1" 200 2
2025-03-20 22:47:22,759 [ scc.repo] DEBUG - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-20 22:47:23,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:23,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-20 22:47:23,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:23,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-20 22:47:24,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:24,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-20 22:47:24,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:24,724 [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-20 22:47:24,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:25,177 [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-20 22:47:25,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:25,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-20 22:47:25,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:26,093 [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-20 22:47:26,094 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-20 22:47:26,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:26,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-20 22:47:26,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:27,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-20 22:47:27,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:27,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-20 22:47:27,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:28,054 [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-20 22:47:28,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:28,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-20 22:47:28,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:28,944 [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-20 22:47:28,945 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-20 22:47:29,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:29,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-20 22:47:29,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:29,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-20 22:47:30,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:30,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-20 22:47:30,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:31,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-20 22:47:31,046 [ scc.repo] DEBUG ## Branches found:
2025-03-20 22:47:31,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-20 22:47:31,046 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:31,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:31,052 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-20 22:47:31,058 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 22:47:31,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-20 22:47:31,070 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-20 22:47:31,080 [ scc.git] DEBUG Already up to date.
2025-03-20 22:47:31,080 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-20 22:47:31,420 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 22:47:31,420 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-20 22:47:31,424 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-20 22:47:31,722 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 22:47:31,722 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-20 22:47:31,728 [ scc.git] DEBUG Calling 'git fetch origin pull/225/head'
2025-03-20 22:47:32,226 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 22:47:32,226 [ scc.git] DEBUG * branch refs/pull/225/head -> FETCH_HEAD
2025-03-20 22:47:32,228 [ scc.git] DEBUG ## Unique users: []
2025-03-20 22:47:32,229 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:32,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:32,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-20 22:47:32,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:32,247 [ 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-20 22:47:32,259 [ 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-20 22:47:32,259 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 22:47:32,259 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 22:47:32,264 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-20 22:47:32,270 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-20 22:47:32,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:32,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:32,552 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-20 22:47:32,561 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-20 22:47:32,567 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#361](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-20 22:47:32,572 [ scc.config] DEBUG Found github.token
2025-03-20 22:47:32,572 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-20 22:47:32,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-20 22:47:32,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:32,583 [ 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-20 22:47:32,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:47:32,596 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-20 22:47:32,596 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-20 22:47:32,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:32,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:32,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...71c6324c4f112dca70d14b0f97390ce6bcdac9f1'
2025-03-20 22:47:32,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:32,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 225 (Fix param names and assertion texts in tests) 71c6324c4f112dca70d14b0f97390ce6bcdac9f1'
2025-03-20 22:47:32,986 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 22:47:32,988 [ scc.git] DEBUG test/integration/test_annotation_scripts.py | 53 +++++++++++++++--------------
2025-03-20 22:47:32,988 [ scc.git] DEBUG 1 file changed, 28 insertions(+), 25 deletions(-)
2025-03-20 22:47:33,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:33,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:33,387 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 22:47:33,426 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 22:47:33,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 22:47:33,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:33,469 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:33,479 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d00678ac0> has no local changes
2025-03-20 22:47:33,479 [ 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)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:33,487 [ scc.git] DEBUG [detached HEAD f0e83ee] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:33,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:33,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 22:47:33,566 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-20 22:47:33,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:33,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:33,812 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-20 22:47:33,817 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-20 22:47:34,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:34,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:34,234 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-20 22:47:34,239 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-20 22:47:34,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:34,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:34,646 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-20 22:47:34,651 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-20 22:47:34,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:35,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:35,070 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-20 22:47:35,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:35,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:35,484 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-20 22:47:35,489 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-20 22:47:35,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:35,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:35,903 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-20 22:47:35,909 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-20 22:47:36,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:36,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:36,307 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-20 22:47:36,312 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-20 22:47:36,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:36,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:36,734 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-20 22:47:36,739 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-20 22:47:36,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:37,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:37,155 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-20 22:47:37,160 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-20 22:47:37,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:37,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:37,606 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-20 22:47:37,610 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-20 22:47:37,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:38,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:38,037 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-20 22:47:38,043 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-20 22:47:38,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:38,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:38,463 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-20 22:47:38,468 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-20 22:47:38,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:38,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:38,896 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-20 22:47:39,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:39,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:39,321 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-20 22:47:39,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:39,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:39,766 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-20 22:47:39,771 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-20 22:47:40,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:40,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:40,189 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-20 22:47:40,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:40,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:40,605 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-20 22:47:40,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:41,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:41,016 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-20 22:47:41,022 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-20 22:47:41,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:41,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:41,431 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-20 22:47:41,437 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-20 22:47:41,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:41,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:41,929 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-20 22:47:41,935 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-20 22:47:42,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:42,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:42,349 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-20 22:47:42,354 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-20 22:47:42,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 22:47:42,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 22:47:42,755 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-20 22:47:42,756 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 22:47:42,835 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5d01366ca0> has local changes
2025-03-20 22:47:42,835 [ 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'
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)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#361 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/361/)'
2025-03-20 22:47:42,849 [ scc.git] DEBUG [detached HEAD 36d1f1d] merge master -Dorg -Ssuccess-only
2025-03-20 22:47:42,850 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-20 22:47:42,850 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-20 22:47:42,850 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,850 [ scc.merge] INFO
2025-03-20 22:47:42,850 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,850 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-20 22:47:42,850 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-20 22:47:42,850 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-20 22:47:42,850 [ scc.merge] INFO
2025-03-20 22:47:42,850 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-20 22:47:42,850 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,850 [ scc.merge] INFO
2025-03-20 22:47:42,850 [ scc.merge] INFO
2025-03-20 22:47:42,850 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-20 22:47:42,850 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,850 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-20 22:47:42,850 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,850 [ scc.merge] INFO
2025-03-20 22:47:42,850 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-20 22:47:42,851 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-20 22:47:42,851 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-20 22:47:42,851 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-20 22:47:42,851 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-20 22:47:42,851 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-20 22:47:42,851 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,851 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-20 22:47:42,851 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-20 22:47:42,851 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-20 22:47:42,852 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-20 22:47:42,852 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-20 22:47:42,852 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-20 22:47:42,852 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-20 22:47:42,852 [ scc.merge] INFO
2025-03-20 22:47:42,852 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,852 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-20 22:47:42,853 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-20 22:47:42,853 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-20 22:47:42,853 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-20 22:47:42,853 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-20 22:47:42,853 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-20 22:47:42,853 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-20 22:47:42,853 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-20 22:47:42,853 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-20 22:47:42,853 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO
2025-03-20 22:47:42,853 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-20 22:47:42,854 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-20 22:47:42,854 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-20 22:47:42,854 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-20 22:47:42,854 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-20 22:47:42,854 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-20 22:47:42,854 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-20 22:47:42,854 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,854 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-20 22:47:42,854 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO
2025-03-20 22:47:42,854 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-20 22:47:42,855 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-20 22:47:42,855 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,855 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] INFO Repository: ome/scripts
2025-03-20 22:47:42,855 [ scc.merge] INFO Excluded PRs:
2025-03-20 22:47:42,855 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-20 22:47:42,855 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-20 22:47:42,855 [ scc.merge] INFO Already up to date.
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] INFO Merged PRs:
2025-03-20 22:47:42,855 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-20 22:47:42,855 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 22:47:42,855 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-20 22:47:42,855 [ scc.merge] INFO
2025-03-20 22:47:42,855 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-20 22:47:42,855 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-20 22:47:42,861 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-20 22:47:42,866 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-20 22:47:42,871 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-20 22:47:42,876 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-20 22:47:42,880 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-20 22:47:42,886 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-20 22:47:42,890 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-20 22:47:42,896 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-20 22:47:42,900 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-20 22:47:42,905 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-20 22:47:42,910 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-20 22:47:42,916 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-20 22:47:42,921 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-20 22:47:42,926 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-20 22:47:42,931 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-20 22:47:42,936 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-20 22:47:42,941 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-20 22:47:42,946 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-20 22:47:42,951 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-20 22:47:42,956 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-20 22:47:42,962 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 22:47:42,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-20 22:47:42,968 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 22:47:42,974 [ 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 287571f] 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 5d412ce] 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-20 22:48:30,093 [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-20 22:48:39,581 [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-20 22:48:42,088 [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-20 22:48:46,848 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-20 22:49:30,491 [ 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