Skipping 192 KB..
Full Log2025-03-24 00:54:16,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-24 00:54:16,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:17,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-24 00:54:17,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:17,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-24 00:54:17,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:18,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-24 00:54:18,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:18,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-03-24 00:54:18,620 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-24 00:54:18,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:19,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-24 00:54:19,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:19,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-24 00:54:19,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:20,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-24 00:54:20,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:20,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-24 00:54:20,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:21,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-24 00:54:21,343 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:21,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-24 00:54:21,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:22,069 [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-24 00:54:22,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:22,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-24 00:54:22,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:22,991 [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-24 00:54:22,992 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-24 00:54:23,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:23,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-24 00:54:23,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:23,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-24 00:54:24,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:24,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-24 00:54:24,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:25,082 [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-24 00:54:25,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:25,581 [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-24 00:54:25,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:26,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-24 00:54:26,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:26,468 [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-24 00:54:26,469 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-24 00:54:26,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:26,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-24 00:54:27,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:27,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-24 00:54:27,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:28,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-24 00:54:28,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:28,561 [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-24 00:54:28,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:29,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-24 00:54:29,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:29,489 [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-24 00:54:29,490 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-24 00:54:29,491 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:54:29,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-24 00:54:29,491 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:29,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:29,500 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:54:29,505 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:54:29,505 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:54:29,512 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:54:29,519 [ scc.git] DEBUG Already up to date.
2025-03-24 00:54:29,519 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-24 00:54:31,361 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-24 00:54:31,361 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-24 00:54:31,368 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-24 00:54:32,697 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-24 00:54:32,697 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-24 00:54:32,704 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-24 00:54:33,101 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-24 00:54:33,101 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-24 00:54:33,107 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-24 00:54:33,400 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-24 00:54:33,400 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-24 00:54:33,406 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-24 00:54:33,693 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-24 00:54:33,693 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-24 00:54:33,698 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:54:33,698 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:33,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:33,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-24 00:54:33,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:33,719 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-24 00:54:33,851 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-24 00:54:33,851 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-24 00:54:33,852 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:54:33,856 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-24 00:54:33,857 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-24 00:54:33,857 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-24 00:54:33,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:34,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:34,039 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-24 00:54:34,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:34,057 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-24 00:54:34,435 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-24 00:54:34,435 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-24 00:54:34,435 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-24 00:54:34,435 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-24 00:54:34,436 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:54:34,441 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-24 00:54:34,441 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-24 00:54:34,442 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-24 00:54:34,442 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-24 00:54:34,442 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-24 00:54:34,442 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-24 00:54:34,442 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-24 00:54:34,442 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-24 00:54:34,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:34,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:34,612 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-24 00:54:34,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:34,630 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-24 00:54:34,764 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-24 00:54:34,765 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:54:34,769 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-24 00:54:34,769 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-24 00:54:34,769 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-24 00:54:34,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:35,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:35,038 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-24 00:54:35,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:35,113 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-24 00:54:35,161 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:54:35,172 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-24 00:54:35,172 [ scc.git] DEBUG package.json | 2 +-
2025-03-24 00:54:35,172 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-24 00:54:35,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:35,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:35,473 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-24 00:54:35,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:35,500 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-24 00:54:35,870 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-24 00:54:35,870 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-24 00:54:35,870 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:54:35,871 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:54:35,878 [ scc.git] DEBUG Calling 'git reset --hard 688556443fae6aab221b63630f129fa596a64d32'
2025-03-24 00:54:35,889 [ scc.git] DEBUG HEAD is now at 6885564 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-24 00:54:35,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:36,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:36,079 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-24 00:54:36,086 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-24 00:54:36,092 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-24 00:54:36,097 [ scc.config] DEBUG Found github.token
2025-03-24 00:54:36,097 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-24 00:54:36,098 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:54:36,143 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:36,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:36,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:54:36,193 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:54:36,204 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724724520> has no local changes
2025-03-24 00:54:36,204 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:54:36,215 [ scc.git] DEBUG [detached HEAD 11f74b1] merge master -Dorg -Ssuccess-only
2025-03-24 00:54:36,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:54:36,216 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:54:36,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:36,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-24 00:54:36,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:37,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-24 00:54:37,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:37,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-24 00:54:37,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:38,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-24 00:54:38,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:38,598 [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-24 00:54:38,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:39,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-24 00:54:39,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:39,588 [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-24 00:54:39,589 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-24 00:54:39,589 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:54:39,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-24 00:54:39,590 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:39,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:39,598 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:54:39,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:54:39,604 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:54:39,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:54:39,617 [ scc.git] DEBUG Already up to date.
2025-03-24 00:54:39,617 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-24 00:54:40,384 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-24 00:54:40,385 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-24 00:54:40,391 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:54:40,391 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:40,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:40,399 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-24 00:54:40,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:40,413 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-24 00:54:40,425 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:54:40,429 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-24 00:54:40,429 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-24 00:54:40,429 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-24 00:54:40,429 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-24 00:54:40,429 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-24 00:54:40,429 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-24 00:54:40,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:40,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:40,591 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:54:40,639 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:40,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:40,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:54:40,694 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:54:40,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f07247a78e0> has no local changes
2025-03-24 00:54:40,702 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:54:40,713 [ scc.git] DEBUG [detached HEAD 31863dc] merge master -Dorg -Ssuccess-only
2025-03-24 00:54:40,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:54:40,713 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:54:40,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:41,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-24 00:54:41,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:41,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-24 00:54:41,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:42,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-24 00:54:42,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:42,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-24 00:54:42,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:43,171 [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-24 00:54:43,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:43,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-24 00:54:43,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:44,167 [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-24 00:54:44,168 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-24 00:54:44,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:44,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-24 00:54:44,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:45,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-24 00:54:45,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:45,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-24 00:54:45,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:46,195 [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-24 00:54:46,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:46,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-24 00:54:47,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:47,188 [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-24 00:54:47,189 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-24 00:54:47,189 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:54:47,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-24 00:54:47,189 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:47,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:47,195 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:54:47,202 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:54:47,202 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:54:47,209 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:54:47,217 [ scc.git] DEBUG Already up to date.
2025-03-24 00:54:47,219 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-24 00:54:48,023 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-24 00:54:48,023 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-24 00:54:48,030 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-24 00:54:48,523 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-24 00:54:48,523 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-24 00:54:48,529 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:54:48,529 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:48,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:48,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-24 00:54:48,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:48,550 [ 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-24 00:54:48,711 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-24 00:54:48,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-24 00:54:48,711 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-24 00:54:48,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-24 00:54:48,712 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:54:48,713 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:54:48,720 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-24 00:54:48,728 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-24 00:54:48,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:48,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:48,893 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-24 00:54:48,903 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-24 00:54:48,989 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-24 00:54:48,995 [ scc.config] DEBUG Found github.token
2025-03-24 00:54:48,996 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-24 00:54:48,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-24 00:54:49,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:49,012 [ 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-24 00:54:49,122 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-24 00:54:49,122 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-24 00:54:49,122 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-24 00:54:49,122 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:54:49,123 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:54:49,131 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-24 00:54:49,141 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-24 00:54:49,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:49,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:54:49,306 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-24 00:54:49,315 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-24 00:54:49,322 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/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-24 00:54:49,329 [ scc.config] DEBUG Found github.token
2025-03-24 00:54:49,329 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-24 00:54:49,329 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:54:49,377 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:49,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:49,383 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:54:49,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:54:49,442 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f072470f250> has no local changes
2025-03-24 00:54:49,442 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:54:49,454 [ scc.git] DEBUG [detached HEAD fcba3b9] merge master -Dorg -Ssuccess-only
2025-03-24 00:54:49,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:54:49,455 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:54:49,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:49,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-24 00:54:50,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:50,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-24 00:54:50,426 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-24 00:54:50,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:50,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-24 00:54:51,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:51,521 [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-24 00:54:51,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:52,068 [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-24 00:54:52,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:52,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-24 00:54:52,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:53,053 [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-24 00:54:53,054 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-24 00:54:53,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:53,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-24 00:54:53,554 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-24 00:54:53,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:54,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-24 00:54:54,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:54,614 [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-24 00:54:54,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:55,154 [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-24 00:54:55,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:55,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-24 00:54:55,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:56,142 [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-24 00:54:56,143 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-24 00:54:56,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:56,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-24 00:54:56,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:57,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-24 00:54:57,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:57,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-24 00:54:57,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:58,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-24 00:54:58,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:58,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-24 00:54:58,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:58,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-24 00:54:59,248 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:54:59,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-24 00:54:59,547 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:54:59,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-24 00:54:59,548 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:54:59,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:54:59,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:54:59,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:54:59,559 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:54:59,565 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:54:59,571 [ scc.git] DEBUG Already up to date.
2025-03-24 00:54:59,571 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-24 00:54:59,887 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-24 00:54:59,887 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-24 00:54:59,893 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-24 00:55:00,237 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-24 00:55:00,237 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-24 00:55:00,242 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:00,242 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:00,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:00,250 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-24 00:55:00,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:00,302 [ 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-24 00:55:00,600 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:55:00,604 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-24 00:55:00,604 [ scc.git] DEBUG package.json | 2 +-
2025-03-24 00:55:00,604 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-24 00:55:00,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:00,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:00,771 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-24 00:55:00,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:00,857 [ 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-24 00:55:00,946 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-24 00:55:00,946 [ scc.git] DEBUG Auto-merging package.json
2025-03-24 00:55:00,947 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:55:00,952 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-24 00:55:00,952 [ scc.git] DEBUG package.json | 2 +-
2025-03-24 00:55:00,952 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-24 00:55:01,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:01,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:01,188 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:01,241 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:01,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:01,250 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:01,296 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:01,304 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f072475bf10> has no local changes
2025-03-24 00:55:01,305 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:01,315 [ scc.git] DEBUG [detached HEAD b9db4bd] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:01,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:01,315 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:01,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:01,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-24 00:55:01,621 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:01,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-24 00:55:01,621 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:01,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:01,628 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:01,633 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:01,634 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:01,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:01,645 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:01,645 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:01,645 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:01,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:01,650 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:01,695 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:01,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:01,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:01,744 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:01,751 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f07247628e0> has no local changes
2025-03-24 00:55:01,751 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:01,761 [ scc.git] DEBUG [detached HEAD 601896c] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:01,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:01,761 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:01,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:02,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-24 00:55:02,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:02,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-24 00:55:02,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:03,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-24 00:55:03,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:03,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-24 00:55:03,670 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:03,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-24 00:55:03,670 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:03,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:03,677 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:03,684 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:03,685 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:03,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:03,699 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:03,700 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:03,700 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:03,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:03,707 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:03,758 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:03,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:03,764 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:03,812 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:03,820 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f07247059a0> has no local changes
2025-03-24 00:55:03,820 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:03,830 [ scc.git] DEBUG [detached HEAD 1ddd794] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:03,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:03,831 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:03,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:04,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-24 00:55:04,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:04,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-24 00:55:04,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:05,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-24 00:55:05,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:05,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-24 00:55:05,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:06,217 [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-24 00:55:06,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:06,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-24 00:55:07,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:07,199 [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-24 00:55:07,200 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-24 00:55:07,200 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:07,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-24 00:55:07,200 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:07,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:07,207 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:07,212 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:07,212 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:07,218 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:07,224 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:07,224 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-24 00:55:08,247 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-24 00:55:08,248 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-24 00:55:08,253 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:08,253 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:08,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:08,259 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-24 00:55:08,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:08,270 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-24 00:55:08,483 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG Auto-merging setup.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-24 00:55:08,483 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:55:08,484 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:55:08,491 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-24 00:55:08,498 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-24 00:55:08,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:08,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:08,667 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-24 00:55:08,674 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-24 00:55:08,682 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-03-24 00:55:08,687 [ scc.config] DEBUG Found github.token
2025-03-24 00:55:08,687 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-24 00:55:08,688 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:08,733 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:08,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:08,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:08,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:08,800 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724717fa0> has no local changes
2025-03-24 00:55:08,800 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:08,811 [ scc.git] DEBUG [detached HEAD fd941c5] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:08,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:08,812 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:08,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:09,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-24 00:55:09,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:09,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-24 00:55:09,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:10,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-24 00:55:10,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:10,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-24 00:55:10,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:11,252 [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-24 00:55:11,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:11,764 [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-24 00:55:12,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:12,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-24 00:55:12,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:12,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-24 00:55:13,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:13,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-24 00:55:13,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:13,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-24 00:55:13,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:14,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-24 00:55:14,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:14,744 [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-24 00:55:14,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:15,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-24 00:55:15,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:15,638 [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-24 00:55:15,639 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-24 00:55:15,639 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:15,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-24 00:55:15,639 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:15,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:15,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:15,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:15,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:15,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:15,667 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:15,668 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-24 00:55:16,167 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-24 00:55:16,168 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-24 00:55:16,173 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:16,173 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:16,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:16,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-24 00:55:16,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:16,203 [ 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-24 00:55:16,250 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:55:16,254 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-24 00:55:16,254 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-24 00:55:16,255 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-24 00:55:16,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-24 00:55:16,256 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-24 00:55:16,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:16,257 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-24 00:55:16,258 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-24 00:55:16,258 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-24 00:55:16,258 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-24 00:55:16,259 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-24 00:55:16,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:16,425 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:16,471 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:16,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:16,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:16,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:16,526 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724701ac0> has no local changes
2025-03-24 00:55:16,527 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:16,537 [ scc.git] DEBUG [detached HEAD ecc3160] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:16,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:16,537 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:16,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:16,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-24 00:55:16,873 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:16,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-24 00:55:16,873 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:16,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:16,880 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:16,885 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:16,885 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:16,891 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:16,897 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:16,897 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:16,897 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:16,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:16,902 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:16,945 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:16,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:16,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:16,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:16,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724718160> has no local changes
2025-03-24 00:55:16,999 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:17,009 [ scc.git] DEBUG [detached HEAD 50e6703] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:17,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:17,009 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:17,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:17,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-24 00:55:17,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:17,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-24 00:55:18,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:18,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-24 00:55:18,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:18,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-24 00:55:19,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:19,383 [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-24 00:55:19,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:19,856 [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-24 00:55:20,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:20,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-24 00:55:20,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:20,821 [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-24 00:55:20,822 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-24 00:55:20,822 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:20,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-24 00:55:20,822 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:20,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:20,828 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:20,833 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:20,833 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:20,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:20,844 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:20,844 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-24 00:55:21,545 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-24 00:55:21,545 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-24 00:55:21,551 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:21,551 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:21,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:21,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-24 00:55:21,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:21,567 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-24 00:55:21,635 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:55:21,638 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-24 00:55:21,638 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-24 00:55:21,638 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-24 00:55:21,638 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-24 00:55:21,638 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-24 00:55:21,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:21,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:21,834 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:21,883 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:21,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:21,890 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:21,936 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:21,943 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724701fa0> has no local changes
2025-03-24 00:55:21,944 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:21,953 [ scc.git] DEBUG [detached HEAD 2186d76] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:21,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:21,954 [ scc.git] INFO Overriding base-branch from master to main
2025-03-24 00:55:21,954 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:22,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:22,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-24 00:55:22,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:22,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-24 00:55:23,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:23,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-24 00:55:23,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:23,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-24 00:55:24,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:24,409 [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-24 00:55:24,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:24,948 [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-24 00:55:25,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:25,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-24 00:55:25,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:26,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-24 00:55:26,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:26,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-24 00:55:26,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:27,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-24 00:55:27,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:27,553 [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-24 00:55:27,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:28,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-24 00:55:28,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:28,524 [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-24 00:55:28,524 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-24 00:55:28,525 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:28,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-24 00:55:28,525 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:28,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:28,532 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-24 00:55:28,537 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:28,537 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-24 00:55:28,543 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-24 00:55:28,549 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:28,549 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-24 00:55:29,004 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-24 00:55:29,004 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-24 00:55:29,009 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:29,010 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:29,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:29,016 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-24 00:55:29,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:29,029 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-24 00:55:29,123 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-24 00:55:29,123 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-24 00:55:29,123 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:55:29,124 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:55:29,131 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-24 00:55:29,139 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-24 00:55:29,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:29,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:29,309 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-24 00:55:29,317 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-24 00:55:29,324 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-24 00:55:29,331 [ scc.config] DEBUG Found github.token
2025-03-24 00:55:29,331 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-24 00:55:29,331 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:29,384 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:29,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:29,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:29,454 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:29,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f07246c4550> has no local changes
2025-03-24 00:55:29,463 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:29,475 [ scc.git] DEBUG [detached HEAD ed7eedf] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:29,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:29,476 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:29,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:29,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-24 00:55:29,757 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:29,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-24 00:55:29,757 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:29,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:29,764 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:29,770 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:29,771 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:29,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:29,786 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:29,787 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:29,787 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:29,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:29,794 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:29,853 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:29,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:29,860 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:29,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:29,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f07246075b0> has no local changes
2025-03-24 00:55:29,915 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:29,926 [ scc.git] DEBUG [detached HEAD b73622b] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:29,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:29,926 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:30,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:30,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-24 00:55:30,201 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:30,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-24 00:55:30,201 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:30,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:30,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:30,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:30,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:30,220 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:30,227 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:30,227 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:30,227 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:30,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:30,233 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:30,279 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:30,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:30,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:30,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:30,341 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f07246c4700> has no local changes
2025-03-24 00:55:30,341 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:30,352 [ scc.git] DEBUG [detached HEAD 3d5d1c4] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:30,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:30,353 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:30,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:30,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-24 00:55:30,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:31,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-24 00:55:31,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:31,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-24 00:55:31,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:32,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-24 00:55:32,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:32,676 [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-24 00:55:32,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:33,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-24 00:55:33,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:33,566 [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-24 00:55:33,567 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-24 00:55:33,567 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:33,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-24 00:55:33,567 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:33,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:33,574 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-24 00:55:33,580 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:33,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-24 00:55:33,587 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-24 00:55:33,595 [ scc.git] DEBUG Already up to date.
2025-03-24 00:55:33,595 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-24 00:55:34,097 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-24 00:55:34,098 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-24 00:55:34,103 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:34,103 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:34,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:34,110 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-24 00:55:34,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:34,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-24 00:55:34,165 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-24 00:55:34,166 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-24 00:55:34,166 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:55:34,166 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:55:34,174 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-24 00:55:34,183 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-24 00:55:34,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:34,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:34,344 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-24 00:55:34,356 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-24 00:55:34,368 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-24 00:55:34,374 [ scc.config] DEBUG Found github.token
2025-03-24 00:55:34,375 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-24 00:55:34,375 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:34,425 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:34,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:34,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:34,480 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:34,489 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724607610> has no local changes
2025-03-24 00:55:34,489 [ 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#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:34,500 [ scc.git] DEBUG [detached HEAD 45998a5] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:34,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:34,501 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-24 00:55:34,501 [ scc.repo] DEBUG ## PRs found:
2025-03-24 00:55:34,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:34,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-24 00:55:35,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:35,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-24 00:55:35,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:35,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-24 00:55:36,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:36,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-24 00:55:36,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:36,771 [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-24 00:55:37,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:37,245 [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-24 00:55:37,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:37,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-24 00:55:37,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:38,124 [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-24 00:55:38,126 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-24 00:55:38,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:38,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-24 00:55:38,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:39,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-24 00:55:39,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:39,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-24 00:55:39,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:40,061 [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-24 00:55:40,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:40,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-24 00:55:40,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:40,994 [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-24 00:55:40,994 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-24 00:55:41,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:41,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-24 00:55:41,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:42,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-24 00:55:42,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:42,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-24 00:55:42,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:43,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-24 00:55:43,031 [ scc.repo] DEBUG ## Branches found:
2025-03-24 00:55:43,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-24 00:55:43,032 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:43,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:43,039 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-24 00:55:43,045 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-24 00:55:43,045 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-24 00:55:43,052 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-24 00:55:43,067 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-24 00:55:43,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:43,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-24 00:55:43,606 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-24 00:55:44,203 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-24 00:55:44,203 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-24 00:55:44,208 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-24 00:55:44,556 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-24 00:55:44,556 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-24 00:55:44,561 [ scc.git] DEBUG ## Unique users: []
2025-03-24 00:55:44,561 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:44,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:44,568 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-24 00:55:44,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:44,585 [ 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-24 00:55:44,675 [ 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-24 00:55:44,675 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-24 00:55:44,676 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-24 00:55:44,683 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-24 00:55:44,690 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-24 00:55:44,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:44,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:44,879 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-24 00:55:44,888 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-24 00:55:44,895 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#365](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-24 00:55:44,900 [ scc.config] DEBUG Found github.token
2025-03-24 00:55:44,900 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-24 00:55:44,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-24 00:55:44,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:44,914 [ 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-24 00:55:44,940 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-24 00:55:44,943 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-24 00:55:44,943 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-24 00:55:45,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:45,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:45,293 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-24 00:55:45,343 [ scc.git] DEBUG Get sha1 of %s
2025-03-24 00:55:45,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-24 00:55:45,350 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:45,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:45,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0724650580> has no local changes
2025-03-24 00:55:45,403 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:45,413 [ scc.git] DEBUG [detached HEAD c962489] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:45,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:45,413 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-24 00:55:45,501 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-24 00:55:45,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:45,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:45,720 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-24 00:55:45,725 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-24 00:55:45,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:46,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:46,144 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-24 00:55:46,148 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-24 00:55:46,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:46,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:46,558 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-24 00:55:46,564 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-24 00:55:46,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:46,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:46,989 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-24 00:55:47,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:47,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:47,398 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-24 00:55:47,403 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-24 00:55:47,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:47,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:47,806 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-24 00:55:47,811 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-24 00:55:48,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:48,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:48,222 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-24 00:55:48,227 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-24 00:55:48,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:48,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:48,636 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-24 00:55:48,641 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-24 00:55:48,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:49,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:49,079 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-24 00:55:49,084 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-24 00:55:49,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:49,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:49,513 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-24 00:55:49,519 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-24 00:55:49,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:49,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:49,960 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-24 00:55:49,965 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-24 00:55:50,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:50,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:50,394 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-24 00:55:50,400 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-24 00:55:50,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:50,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:50,820 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-24 00:55:51,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:51,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:51,276 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-24 00:55:51,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:51,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:51,695 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-24 00:55:51,704 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-24 00:55:51,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:52,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:52,123 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-24 00:55:52,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:52,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:52,544 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-24 00:55:52,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:52,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:52,948 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-24 00:55:52,955 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-24 00:55:53,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:53,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:53,361 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-24 00:55:53,368 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-24 00:55:53,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:53,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:53,782 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-24 00:55:53,787 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-24 00:55:54,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:54,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:54,197 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-24 00:55:54,217 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-24 00:55:54,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-24 00:55:54,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-24 00:55:54,623 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-24 00:55:54,623 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-24 00:55:54,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0727517f10> has local changes
2025-03-24 00:55:54,735 [ 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#365 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/365/)'
2025-03-24 00:55:54,754 [ scc.git] DEBUG [detached HEAD dbf92ee] merge master -Dorg -Ssuccess-only
2025-03-24 00:55:54,755 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-24 00:55:54,755 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-24 00:55:54,755 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,755 [ scc.merge] INFO
2025-03-24 00:55:54,755 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,755 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-24 00:55:54,755 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-24 00:55:54,755 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-24 00:55:54,755 [ scc.merge] INFO
2025-03-24 00:55:54,755 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-24 00:55:54,755 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,755 [ scc.merge] INFO
2025-03-24 00:55:54,755 [ scc.merge] INFO
2025-03-24 00:55:54,755 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-24 00:55:54,755 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,755 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-24 00:55:54,755 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-24 00:55:54,756 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-24 00:55:54,756 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-24 00:55:54,756 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-24 00:55:54,756 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-24 00:55:54,756 [ scc.merge] INFO
2025-03-24 00:55:54,756 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-24 00:55:54,756 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-24 00:55:54,756 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-24 00:55:54,756 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-24 00:55:54,757 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-24 00:55:54,757 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-24 00:55:54,757 [ scc.merge] INFO
2025-03-24 00:55:54,757 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-24 00:55:54,757 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,757 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-24 00:55:54,758 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-24 00:55:54,758 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-24 00:55:54,758 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-24 00:55:54,758 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-24 00:55:54,758 [ scc.merge] INFO
2025-03-24 00:55:54,758 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-24 00:55:54,758 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-24 00:55:54,758 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-24 00:55:54,759 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-24 00:55:54,759 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-24 00:55:54,759 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-24 00:55:54,759 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-24 00:55:54,759 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-24 00:55:54,759 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-24 00:55:54,759 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-24 00:55:54,759 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,759 [ scc.merge] INFO
2025-03-24 00:55:54,759 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,760 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-24 00:55:54,760 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-24 00:55:54,760 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,760 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-24 00:55:54,760 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,760 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-24 00:55:54,760 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-24 00:55:54,760 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,760 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-24 00:55:54,760 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-24 00:55:54,760 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-24 00:55:54,760 [ scc.merge] INFO Already up to date.
2025-03-24 00:55:54,760 [ scc.merge] INFO
2025-03-24 00:55:54,760 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,761 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-24 00:55:54,761 [ scc.merge] INFO
2025-03-24 00:55:54,761 [ scc.merge] INFO Repository: ome/scripts
2025-03-24 00:55:54,761 [ scc.merge] INFO Excluded PRs:
2025-03-24 00:55:54,761 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-24 00:55:54,761 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-24 00:55:54,761 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-24 00:55:54,761 [ scc.merge] INFO Previously merged:
2025-03-24 00:55:54,761 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-24 00:55:54,761 [ scc.merge] INFO
2025-03-24 00:55:54,761 [ scc.merge] INFO Merged PRs:
2025-03-24 00:55:54,761 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-24 00:55:54,761 [ scc.merge] INFO
2025-03-24 00:55:54,761 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-24 00:55:54,761 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-24 00:55:54,761 [ scc.merge] INFO
2025-03-24 00:55:54,761 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-24 00:55:54,761 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-24 00:55:54,768 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-24 00:55:54,775 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-24 00:55:54,782 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-24 00:55:54,788 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-24 00:55:54,795 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-24 00:55:54,802 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-24 00:55:54,808 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-24 00:55:54,815 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-24 00:55:54,822 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-24 00:55:54,829 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-24 00:55:54,835 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-24 00:55:54,842 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-24 00:55:54,850 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-24 00:55:54,857 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-24 00:55:54,864 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-24 00:55:54,871 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-24 00:55:54,878 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-24 00:55:54,885 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-24 00:55:54,893 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-24 00:55:54,901 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-24 00:55:54,908 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-24 00:55:54,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-24 00:55:54,916 [ scc.git] DEBUG Calling 'git remote'
2025-03-24 00:55:54,923 [ 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 c79ef83] 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 fe52240] 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-24 00:56:47,034 [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-24 00:56:56,593 [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-24 00:56:59,212 [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-24 00:57:04,070 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-24 00:57:44,179 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/f8f0d1dd/images/svgs/logo.svg){kind=logo}
