Skip to content
Snippets Groups Projects
Commit 60129177 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '88-trivy-nevers-fails' into 'master'

Resolve "Trivy never fails"

Closes #88

See merge request to-be-continuous/python!118
parents 432f9efb 671b7814
No related branches found
Tags 7.1 7.1.1
No related merge requests found
...@@ -247,7 +247,7 @@ It is bound to the `test` stage, and uses the following variables: ...@@ -247,7 +247,7 @@ It is bound to the `test` stage, and uses the following variables:
| ---------------- | ----------------------------------------------------------------------- | ----------------- | | ---------------- | ----------------------------------------------------------------------- | ----------------- |
| `trivy-disabled` / `PYTHON_TRIVY_DISABLED` | Set to `true` to disable Trivy job | _none_ (enabled) | | `trivy-disabled` / `PYTHON_TRIVY_DISABLED` | Set to `true` to disable Trivy job | _none_ (enabled) |
| `trivy-dist-url` / `PYTHON_TRIVY_DIST_URL` | Url to the `tar.gz` package for `linux_amd64` of Trivy to use (ex: `https://github.com/aquasecurity/trivy/releases/download/v0.51.1/trivy_0.51.1_Linux-64bit.tar.gz`)<br/>_When unset, the latest version will be used_ | _none_ | | `trivy-dist-url` / `PYTHON_TRIVY_DIST_URL` | Url to the `tar.gz` package for `linux_amd64` of Trivy to use (ex: `https://github.com/aquasecurity/trivy/releases/download/v0.51.1/trivy_0.51.1_Linux-64bit.tar.gz`)<br/>_When unset, the latest version will be used_ | _none_ |
| `trivy-args` / `PYTHON_TRIVY_ARGS` | Additional [Trivy CLI options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_filesystem/) | `--pkg-types library --detection-priority comprehensive` | | `trivy-args` / `PYTHON_TRIVY_ARGS` | Additional [Trivy CLI options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_filesystem/) | `--ignore-unfixed --pkg-types library --detection-priority comprehensive` |
In addition to a textual report in the console, this job produces the following reports, kept for one day: In addition to a textual report in the console, this job produces the following reports, kept for one day:
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
{ {
"name": "PYTHON_TRIVY_ARGS", "name": "PYTHON_TRIVY_ARGS",
"description": "Additional [Trivy CLI options](https://aquasecurity.github.io/trivy/v0.21.1/getting-started/cli/fs/)", "description": "Additional [Trivy CLI options](https://aquasecurity.github.io/trivy/v0.21.1/getting-started/cli/fs/)",
"default": "--pkg-types library --detection-priority comprehensive", "default": "--ignore-unfixed --pkg-types library --detection-priority comprehensive",
"advanced": true "advanced": true
} }
] ]
......
...@@ -109,7 +109,7 @@ spec: ...@@ -109,7 +109,7 @@ spec:
default: '' default: ''
trivy-args: trivy-args:
description: Additional [Trivy CLI options](https://aquasecurity.github.io/trivy/v0.21.1/getting-started/cli/fs/) description: Additional [Trivy CLI options](https://aquasecurity.github.io/trivy/v0.21.1/getting-started/cli/fs/)
default: --pkg-types library --detection-priority comprehensive default: --ignore-unfixed --pkg-types library --detection-priority comprehensive
sbom-disabled: sbom-disabled:
description: Disable Software Bill of Materials description: Disable Software Bill of Materials
type: boolean type: boolean
...@@ -1303,7 +1303,7 @@ py-trivy: ...@@ -1303,7 +1303,7 @@ py-trivy:
then then
$python_trivy fs ${PYTHON_TRIVY_ARGS} --exit-code 0 --list-all-pkgs --format json --output reports/py-trivy.trivy.json ./reports/ $python_trivy fs ${PYTHON_TRIVY_ARGS} --exit-code 0 --list-all-pkgs --format json --output reports/py-trivy.trivy.json ./reports/
fi fi
$python_trivy fs ${PYTHON_TRIVY_ARGS} --format table ./reports/ $python_trivy fs ${PYTHON_TRIVY_ARGS} --exit-code 1 --format table ./reports/
artifacts: artifacts:
name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG" name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"
expire_in: 1 day expire_in: 1 day
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment