Commit 263f10f6 authored by Adrian DC's avatar Adrian DC
Browse files

fix(parsers): resolve #270 by expanding jobs 'tags' lists 

Signed-off-by: default avatarAdrian DC <radian.dc@gmail.com>
parent 9953e7d6

gitlabci_local/parsers/gitlab.py

+2 −0
Changes for gitlabci_local/parsers/gitlab.py: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ class GitLab: 
        # Extract job tags

        if 'tags' in job_data and job_data['tags']:

            job['tags'] = job_data['tags'][:]

            for index, tag in enumerate(job['tags']):

                job['tags'][index] = Environment.expand(tag)



        # Extract job trigger

        if 'trigger' in job_data and job_data['trigger']:

tests/variables/.gitlab-ci.tags.yml

0 → 100644
+14 −0
Changes for tests/variables/.gitlab-ci.tags.yml: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line 
image: local



variables:

  DEFAULT_TAG: docker



stages:

  - variables



'Job 1':

  stage: variables

  script:

    - echo 'Job 1'

  tags:

    - ${DEFAULT_TAG}

tests/variables/test.sh

+2 −0
Changes for tests/variables/test.sh: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ IMAGE_REFERENCE_1='local' IMAGE_REFERENCE_5='local' gitlabci-local -p 
gitlabci-local -c ./.gitlab-ci.nested.yml -p

gitlabci-local -c ./.gitlab-ci.image.yml -p

gitlabci-local -c ./.gitlab-ci.images.yml -p

gitlabci-local -c ./.gitlab-ci.tags.yml --dump | grep -A1 'tags' | grep '\$' && exit 1 || true

gitlabci-local -c ./.gitlab-ci.tags.yml --dump | grep -A1 'tags' | grep 'docker'