Commit 8a65e600 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '85-aws-codeartifact-variant' into 'master' 

fix: incorrect before_script

Closes #85

See merge request to-be-continuous/python!128
parents 14d2ef31 c913e653

README.md

+2 −2
Original line number Diff line number Diff line
@@ -638,13 +638,13 @@ then set the required configuration. 


```yaml

include:

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

  - component: $CI_SERVER_FQDN/to-be-continuous/python/gitlab-ci-python@7.5.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-ca@7.3.2

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

    inputs:

      aws-region: "us-east-1"

      aws-codeartifact-domain: "acme"

templates/gitlab-ci-python-aws-codeartifact.yml

+5 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ variables: 


.codeartifact-pip-config:

  before_script:

    - CODEARTIFACT_URL=https://aws:${CODEARTIFACT_AUTH_TOKEN}@${CODEARTIFACT_REPOSITORY_ENDPOINT#https://}simple

    - CODEARTIFACT_URL=https://aws:${PYTHON_REPOSITORY_PASSWORD}@${PYTHON_REPOSITORY_URL#https://}simple

    - pip config set global.index-url $CODEARTIFACT_URL



.python-base:
@@ -49,12 +49,13 @@ variables: 
    AWS_JWT:

      aud: "$AWS_OIDC_AUD"

  variables:

    CODEARTIFACT_AUTH_TOKEN: "@url@http://aws-auth-provider/codeartifact/auth/token"

    CODEARTIFACT_REPOSITORY_ENDPOINT: "@url@http://aws-auth-provider/codeartifact/repository/endpoint?format=pypi"

    PYTHON_REPOSITORY_USERNAME: aws

    PYTHON_REPOSITORY_PASSWORD: "@url@http://aws-auth-provider/codeartifact/auth/token"

    PYTHON_REPOSITORY_URL: "@url@http://aws-auth-provider/codeartifact/repository/endpoint?format=pypi"

    AWS_JWT: "$AWS_JWT"

  before_script:

    - !reference [.codeartifact-pip-config:]

    - !reference [.python-scripts]

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - cd ${PYTHON_PROJECT_DIR}

    - guess_build_system

    - !reference [.codeartifact-pip-config, before_script]