Skip to content
Snippets Groups Projects
Commit b2e5045f authored by Benguria Elguezabal, Gorka's avatar Benguria Elguezabal, Gorka
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
parents 1efda69d ad360c7a
No related branches found
No related tags found
No related merge requests found
Pipeline #169968 passed
......@@ -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@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.8.0
# 2: set/override component inputs
inputs:
image: registry.hub.docker.com/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: '7.7.1'
ref: '7.8.0'
file: '/templates/gitlab-ci-python.yml'
variables:
......@@ -580,9 +580,9 @@ With:
```yaml
include:
# main component
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.8.0
# Vault variant
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-vault@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-vault@7.8.0
inputs:
vault-base-url: "https://vault.acme.host/v1"
# audience claim for JWT
......@@ -621,13 +621,13 @@ The variant requires the additional configuration parameters:
```yaml
include:
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.8.0
# 2: set/override component inputs
inputs:
image: registry.hub.docker.com/library/python:3.12-slim
pytest-enabled: true
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-gcp@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-gcp@7.8.0
inputs:
# common OIDC config for non-prod envs
gcp-oidc-provider: "projects/<gcp_nonprod_proj_id>/locations/global/workloadIdentityPools/<pool_id>/providers/<provider_id>"
......@@ -687,13 +687,13 @@ then set the required configuration.
```yaml
include:
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.8.0
# 2: set/override component inputs
inputs:
image: registry.hub.docker.com/library/python:3.12-slim
pytest-enabled: true
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-aws-codeartifact@7.7.1
- component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python-aws-codeartifact@7.8.0
inputs:
aws-region: "us-east-1"
aws-codeartifact-domain: "acme"
......
......@@ -44,7 +44,7 @@ variables:
image: $PYTHON_IMAGE
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "python", "7.7.1"]
command: ["--service", "python", "7.8.0"]
variables:
GCP_JWT: $GCP_JWT
before_script:
......
......@@ -22,7 +22,7 @@ variables:
.python-base:
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "python", "7.7.1"]
command: ["--service", "python", "7.8.0"]
- name: "$TBC_VAULT_IMAGE"
alias: "vault-secrets-provider"
variables:
......
......@@ -295,10 +295,7 @@ workflow:
- when: on_success
variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: "registry.gitlab.com/to-be-continuous/tools/tracking:master"
# PYTHON_IMAGE: "registry.hub.docker.com/library/python:3"
# Default Docker image (can be overridden)
PYTHON_IMAGE: $[[ inputs.image ]]
# Default Python project root directory
PYTHON_PROJECT_DIR: $[[ inputs.project-dir ]]
......@@ -1032,7 +1029,7 @@ stages:
image: $PYTHON_IMAGE
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "python", "7.7.1"]
command: ["--service", "python", "7.8.0"]
variables:
# set local cache dir; most Python tools honour XDG specs
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment