Commit 3132d756 authored Jan 26, 2024 by Cédric OLIVIER

Merge branch '63-python-index-cataloger-does-not-exist' into 'master'

Resolve "python-index-cataloger does not exist"

Closes #63

See merge request to-be-continuous/python!96

parents c20bf394 69531a8e

README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -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:

kicker.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		}
		]

templates/gitlab-ci-python.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -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