Commit e5a22dc5 authored by Guilhem Bonnefille's avatar Guilhem Bonnefille
Browse files

Merge branch 'master' into 'renovate/tbc-deps' 

# Conflicts:
#   .gitlab-ci.yml
parents 9db994e2 cc96cc59

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ include: 
    inputs:

      shellcheck-files: "*.sh"

  - component: $CI_SERVER_FQDN/to-be-continuous/gitleaks/gitlab-ci-gitleaks@2.8

  - component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.16

  - component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@4.0



variables:

  GITLAB_CI_FILES: "templates/gitlab-ci-python.yml"

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
## [8.1.3](https://gitlab.com/to-be-continuous/python/compare/8.1.2...8.1.3) (2025-08-26)





### Bug Fixes



* **vault:** avoid nested variable for id_token ([fd30c0b](https://gitlab.com/to-be-continuous/python/commit/fd30c0b1db933382da32587982820f83c8f7cc32))



## [8.1.2](https://gitlab.com/to-be-continuous/python/compare/8.1.1...8.1.2) (2025-08-21)

README.md

+8 −8
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`: 
```yaml

include:

  # 1: include the component

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.3

    # 2: set/override component inputs

    inputs:

      image: docker.io/library/python:3.12-slim
@@ -29,7 +29,7 @@ Add the following to your `.gitlab-ci.yml`: 
include:

  # 1: include the template

  - project: 'to-be-continuous/python'

    ref: '8.1.2'

    ref: '8.1.3'

    file: '/templates/gitlab-ci-python.yml'



variables:
@@ -643,9 +643,9 @@ With: 
```yaml

include:

  # main component

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.3

  # Vault variant

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-vault@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-vault@8.1.3

    inputs:

      vault-base-url: "https://vault.acme.host/v1"

      # audience claim for JWT
@@ -684,13 +684,13 @@ The variant requires the additional configuration parameters: 


```yaml

include:

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.3

    # 2: set/override component inputs

    inputs:

      image: docker.io/library/python:3.12-slim

      pytest-enabled: true



  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-gcp@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-gcp@8.1.3

    inputs:

      # common OIDC config for non-prod envs

      gcp-oidc-provider: "projects/<gcp_nonprod_proj_id>/locations/global/workloadIdentityPools/<pool_id>/providers/<provider_id>"
@@ -750,13 +750,13 @@ then set the required configuration. 


```yaml

include:

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@8.1.3

    # 2: set/override component inputs

    inputs:

      image: docker.io/library/python:3.12-slim

      pytest-enabled: true



  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-aws-codeartifact@8.1.2

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-aws-codeartifact@8.1.3

    inputs:

      aws-region: "us-east-1"

      aws-codeartifact-domain: "acme"

templates/gitlab-ci-python-gcp.yml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ variables: 
  image: $PYTHON_IMAGE

  services:

    - name: "$TBC_TRACKING_IMAGE"

      command: ["--service", "python", "8.1.2"]

      command: ["--service", "python", "8.1.3"]

  id_tokens:

    GCP_JWT:

      aud: "$GCP_OIDC_AUD"

templates/gitlab-ci-python-vault.yml

+6 −5
Original line number Diff line number Diff line
@@ -22,15 +22,16 @@ variables: 
.python-base:

  services:

    - name: "$TBC_TRACKING_IMAGE"

      command: ["--service", "python", "8.1.2"]

      command: ["--service", "python", "8.1.3"]

    - name: "$TBC_VAULT_IMAGE"

      alias: "vault-secrets-provider"

      variables:

        SKIP_SSL: "false"

  variables:

    VAULT_JWT_TOKEN: "$VAULT_JWT_TOKEN"

    VAULT_CA_CERTS: |

      $DEFAULT_CA_CERTS

      $CUSTOM_CA_CERTS

        SKIP_SSL: "false"

  id_tokens:

    VAULT_JWT_TOKEN:

      aud: "$VAULT_OIDC_AUD"