KASM-6955 Fix issue with readme pipeline variables not getting passed into sub-pipeline

This commit is contained in:
Ian Tangney 2025-03-28 14:43:19 +00:00
parent fc2d5994d3
commit 73e8248f01
No known key found for this signature in database
2 changed files with 51 additions and 34 deletions

View File

@ -34,12 +34,39 @@ pipeline:
stage: run stage: run
except: except:
variables: variables:
- $README_USERNAME_RUN
- $README_PASSWORD_RUN
- $QUAY_API_KEY_RUN
- $DOCKERHUB_REVERT_RUN - $DOCKERHUB_REVERT_RUN
- $REVERT_IS_ROLLING_RUN - $REVERT_IS_ROLLING_RUN
trigger: trigger:
include: include:
- artifact: gitlab-ci.yml - artifact: gitlab-ci.yml
job: template job: template
pipeline_readme:
stage: run
only:
variables:
- $README_USERNAME_RUN
- $README_PASSWORD_RUN
variables:
README_USERNAME: $README_USERNAME_RUN
README_PASSWORD: $README_PASSWORD_RUN
trigger:
include:
- artifact: gitlab-ci.yml
job: template
pipeline_readme_quay:
stage: run
only:
variables:
- $QUAY_API_KEY_RUN
variables:
QUAY_API_KEY: $QUAY_API_KEY_RUN
trigger:
include:
- artifact: gitlab-ci.yml
job: template
pipeline_revert: pipeline_revert:
stage: run stage: run
only: only:

View File

@ -41,9 +41,9 @@ build_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
tags: tags:
@ -67,9 +67,9 @@ build_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
tags: tags:
@ -94,9 +94,9 @@ test_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -124,9 +124,9 @@ test_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -158,9 +158,9 @@ manifest_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -188,9 +188,9 @@ manifest_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -213,11 +213,8 @@ update_readmes_{{ IMAGE.name }}:
- bash ci-scripts/readme.sh "{{ IMAGE.name }}" - bash ci-scripts/readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
variables:
README_USERNAME: $README_USERNAME_RUN
README_PASSWORD: $README_PASSWORD_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}
@ -230,11 +227,8 @@ update_readmes_{{ IMAGE.name }}:
- bash ci-scripts/readme.sh "{{ IMAGE.name }}" - bash ci-scripts/readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
variables:
README_USERNAME: $README_USERNAME_RUN
README_PASSWORD: $README_PASSWORD_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}
@ -248,9 +242,7 @@ update_quay_readmes_{{ IMAGE.name }}:
- bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}" - bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
variables:
QUAY_API_KEY: $QUAY_API_KEY_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}
@ -263,9 +255,7 @@ update_quay_readmes_{{ IMAGE.name }}:
- bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}" - bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
variables:
QUAY_API_KEY: $QUAY_API_KEY_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}