diff --git a/README.md b/README.md index ad21f0ee55d727c7eabc5ab9deaabecfa5ad0862..e18845f2717439c729b67a32e9d26f0cc817220e 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,7 @@ It is bound to the `test` stage, and uses the following variables: | `sbom-disabled` / `PYTHON_SBOM_DISABLED` | Set to `true` to disable this job | _none_ | | `sbom-syft-url` / `PYTHON_SBOM_SYFT_URL` | Url to the `tar.gz` package for `linux_amd64` of Syft to use (ex: `https://github.com/anchore/syft/releases/download/v0.62.3/syft_0.62.3_linux_amd64.tar.gz`)<br/>_When unset, the latest version will be used_ | _none_ | | `sbom-name` / `PYTHON_SBOM_NAME` | Component name of the emitted SBOM | `$CI_PROJECT_PATH/$PYTHON_PROJECT_DIR` | -| `sbom-opts` / `PYTHON_SBOM_OPTS` | Options for syft used for SBOM analysis | `--catalogers python-index-cataloger` | +| `sbom-opts` / `PYTHON_SBOM_OPTS` | Options for syft used for SBOM analysis | `--override-default-catalogers python-package-cataloger` | In addition to logs in the console, this job produces the following reports, kept for one week: diff --git a/kicker.json b/kicker.json index dca014e3a94236dde60fe0dcfd74127e73565f18..4421f5a139646c276d847078c63d54e6bd409949 100644 --- a/kicker.json +++ b/kicker.json @@ -168,7 +168,7 @@ { "name": "PYTHON_SBOM_OPTS", "description": "Options for syft used for SBOM analysis", - "default": "--catalogers python-index-cataloger", + "default": "--override-default-catalogers python-package-cataloger", "advanced": true } ] diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml index 6d85d1fb66d91ec7744719c56f96fe81709a627d..773dbd42c315f2d16adc96d1f8f63d6458a2d99f 100644 --- a/templates/gitlab-ci-python.yml +++ b/templates/gitlab-ci-python.yml @@ -121,7 +121,7 @@ spec: default: $CI_PROJECT_PATH/$PYTHON_PROJECT_DIR sbom-opts: description: Options for syft used for SBOM analysis - default: --catalogers python-index-cataloger + default: --override-default-catalogers python-package-cataloger release-enabled: description: Enable Release type: boolean