diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-04-13 08:19:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-04-13 09:10:59 +0200 |
| commit | 8e37037e8830a40c97d6bb8992b3c4b9eb3fcc09 (patch) | |
| tree | 0e31ea3395ae0226d667c0ab1b92ff6b6aa8b88a /.gitlab-ci/ci.template | |
| parent | 31c05da92c44ab22bfeafc3e492affe5dad89202 (diff) | |
| download | NetworkManager-8e37037e8830a40c97d6bb8992b3c4b9eb3fcc09.tar.gz | |
gitlab-ci: drop "tag"/"default_tag" from ci templates
The tag we actually use already contains a hash of the input files and
is generated (by `ci-fairy generate-templates`). There is no need for having
this fixed prefix. As also seens by having a date there, which is maintained
badly and meaningless.
Drop it.
Diffstat (limited to '.gitlab-ci/ci.template')
| -rw-r--r-- | .gitlab-ci/ci.template | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index e2b2b0b1f3..521896ea00 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -17,10 +17,10 @@ .templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile -{# Group distros by their common (name,base_type,tag) tuples.#} +{# Group distros by their common (name,base_type) tuples.#} {% set distro_groups = [] %} {% for distro in distributions %} - {% set g = {'name':distro.name,'base_type':distro.base_type,'tag':distro.tag} %} + {% set g = {'name':distro.name,'base_type':distro.base_type} %} {% if g not in distro_groups %} {% do distro_groups.append(g) %} {% endif %} @@ -62,7 +62,7 @@ variables: # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". {% for distro_group in distro_groups|sort(attribute='name') %} - {{"%-13s"| format(distro_group.name.upper() + '_TAG:')}}'{{distro_group.tag}}-{{ + {{"%-13s"| format(distro_group.name.upper() + '_TAG:')}}'tag-{{ (ci_fairy.hashfiles('./.gitlab-ci/config.yml', './.gitlab-ci/ci.template', './.gitlab-ci/' + distro_group.base_type + '-install.sh', |