update to use new version of Kangooroo #90
Conversation
This file contains 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
cccs-shellyw
commented
Dec 3, 2024
cccs-shellyw
commented
- use new Kangooroo with different command argument and result.json format
- download Kangooroo from its github release
- update tests to the new result.json format
cccs-shellyw
force-pushed
the
update-kangooroo-version
branch
from
e528b58 to
2f96ac6
Compare
cccs-shellyw
force-pushed
the
update-kangooroo-version
branch
9 times, most recently
from
b21cf30 to
de239ac
Compare
cccs-shellyw
force-pushed
the
update-kangooroo-version
branch
2 times, most recently
from
60044ba to
bc3ec1c
Compare
cccs-shellyw
force-pushed
the
update-kangooroo-version
branch
from
bc3ec1c to
c629ef3
Compare
gdesmar
requested changes
Dec 17, 2024
| @@ -180,21 +180,21 @@ def execute(self, request: ServiceRequest) -> None: | |||
| yaml.dump(kangooroo_config, temp_conf) | |||
|
|
|||
| kangooroo_args = [ | |||
| "java", | |||
| f"-Xmx{math.floor(self.service_attributes.docker_config.ram_mb*0.75)}m", | |||
There was a problem hiding this comment.
I had problem without limiting the memory on the java call. This needs to stay.
| @@ -3,24 +3,37 @@ | |||
| "drop_file": false, | |||
| "score": 0, | |||
| "sections": [ | |||
| { | |||
| "auto_collapse": false, | |||
| "body": "URL 'https://news.slashdot.org/comments.pl?sid=11253499&cid=55399795' (380369f835d00015f089274107cf114d) was requested but a different URL was fetched (d86e2b62b352d8f9c944980f534f86fe).", | |||
There was a problem hiding this comment.
Can you check all results.json where they have changed? They should not have changed unless you meant to change it like the sample_zip test where you modified the IP address.
...a5efda2dec3f78fc95f8aad7df62539b384390c364b0470960b31130b_json_schema/kangooroo/results.json
Show resolved
Hide resolved
gdesmar
reviewed
Dec 27, 2024
| @@ -35,6 +39,3 @@ RUN pip install --no-cache-dir --user --requirement requirements.txt && rm -rf ~ | |||
| ARG version=4.0.0.dev1 | |||
| USER root | |||
| RUN sed -i -e "s/\$SERVICE_TAG/$version/g" service_manifest.yml | |||
|
|
|||
| # Switch to assemblyline user | |||
| USER assemblyline | |||
gdesmar
reviewed
Dec 27, 2024
| USER root | ||
|
|
||
| RUN apt update -y && \ | ||
| apt install -y wget default-jre unzip && \ | ||
| apt install -y wget wget default-jre unzip ffmpeg build-essential libffi-dev python3 python3-dev python3-pip libfuzzy-dev && \ |
There was a problem hiding this comment.
You added a duplicate wget
gdesmar
reviewed
Dec 27, 2024
| USER root | ||
|
|
||
| RUN apt update -y && \ | ||
| apt install -y wget default-jre unzip && \ | ||
| apt install -y wget wget default-jre unzip ffmpeg build-essential libffi-dev python3 python3-dev python3-pip libfuzzy-dev && \ |
There was a problem hiding this comment.
Are all of the new libraries really required?
gdesmar
reviewed
Dec 27, 2024
| ] | ||
| if self.no_sandbox: | ||
| kangooroo_args.insert(-2, "--no-sandbox") | ||
| try: | ||
| subprocess.run(kangooroo_args, cwd=KANGOOROO_FOLDER, capture_output=True, timeout=self.request_timeout) | ||
| subprocess.run(kangooroo_args, cwd=KANGOOROO_FOLDER, |
There was a problem hiding this comment.
Can you use the settings from .vscode/settings.json so that it applies the right formatter?
gdesmar
reviewed
Dec 27, 2024
| "fetchResult": { | ||
| "response_code": 200, | ||
| "connection_success": true, |
There was a problem hiding this comment.
Are those three boolean supposed to be actual booleans or strings? They are stored as strings in other results.json files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.