This repository was archived by the owner on Oct 31, 2025. It is now read-only.
mrc-6454 Replace Orderly Web with Packit#33
Merged
EmmaLRussell merged 36 commits intomasterfrom Jul 29, 2025
Merged
Conversation
richfitz
approved these changes
Jul 28, 2025
| pyyaml | ||
| montagu>=0.0.2 | ||
| orderlyweb-api>=1.0.0 | ||
| git+https://github.com/reside-ic/youtrack-rest-python-library |
Member
There was a problem hiding this comment.
we should get that on pypi if we still want to use it (separate to this ofc)
| set -ex | ||
|
|
||
| here=$(dirname $0) | ||
| export REGISTRY=vimc |
Member
There was a problem hiding this comment.
do we not have things on ghcr yet? I guess not for montagu...something else to add to the backlog :(
Comment on lines
+39
to
+40
| hatch env run pip3 install constellation | ||
| hatch env run pip3 install packit-deploy |
Member
There was a problem hiding this comment.
if we're using hatch, why not add these to the pyproject.toml so they're installed when hatch builds the env?
Member
There was a problem hiding this comment.
I don't actually see how this is working - I'll follow up in person
| self.__verify = not config.packit_disable_certificate_verify | ||
| self.__authenticate() | ||
|
|
||
| def __url(self, relative_url): |
Member
There was a problem hiding this comment.
single underscore for private but nbd
| @@ -0,0 +1,165 @@ | |||
| import json | |||
Member
There was a problem hiding this comment.
let's move this into a package later so we can reuse it at some point in future
| token: | ||
| smtp: | ||
| host: montagu_smtp_server_1 | ||
| host: montagu-smtp_server-1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This branch replaces OrderlyWeb with Packit in the implementation of the Diagnostic Report task.
In the
run-dependenciesscript we now run packit deploy rather than installing orderly web. For some reason, packit deploy has a non-0 exit code, which we need to work around - even though everything seems to deploy just fine!In the python code,
OrderlyWebClientWrapperhas been replaced withPackitClientto do the communication with Packit api to run tasks and poll for packet completion.This reproduces some logic which was in the old OW wrapper to deal with token expiry - so all API calls are wrapped by
executewhich re-authenticates if necessary.We no longer have a report timeout - this was supported by OW package, but we don't really have the concept in Packit I don't think. Could implement it in the task queue if necessary.
When we run a report task, we always use the main branch of the orderly repo. We need to provide a ref, so the client gets the latest commit for the branch. Potentially this could be replaced with "HEAD" if we update orderly runner to support this.
Previously, the task would publish the report by using the publish method on the ow wrapper. In packit, publishing is just a case of giving roles permission to view a packet, so for each report we configure a list of
publish_roles(which may be user roles or group roles) who should be granted permission to view the new packet.I've replaced some OW terminology with Packit terminology ("packet" for "version") but retained "report" and "publish" as they feel meaningful in the VIMC context and would be a lot of changes to eradicate!
There are also config file changes to replace OW config with Packit url etc. We'll need to update the corresponding config in
montagu-config.There were a few updates to get the dev run working - usual hyphen changes to update docker compose, and also needed to run the montagu proxy to get the preauth/montagu auth support. This meant optionally supporting disable certificate verification in the requests package to coax it to talk to local proxy with self-signed cert.
This can be tested locally, or on UAT, where it has been end-to-end tested by re-uploading the latest default-Routine-R burden estimates for the IC-Okell modelling group through the Modellers Contrib Portal (packet link). You should find that a new packet is created as well as a YouTrack ticket created or updated with the latest pcket link. You can check the logs of the
montagu-task-queuecontainer to check task progress.There are some outstanding issues with setting tags on the YouTrack ticket created or updated by the task - but I want to fix them in another branch (if still actually necessary - I'll check with Katy) as this one has dragged on long enough! These issues are described in this ticket.