Commit 5e83d174 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-rulesKeyConflict' into 'dev'

Hotfix rules key conflict

See merge request redmic-project/gitlab-ci-templates!48
parents e2c27b7a b5ed2926
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -31,7 +31,12 @@ lint-dockerfile:

container_scanning:
  stage: post-package
  only:
    - branches
  except:
    - schedules
  rules:
    - if: $CONTAINER_SCANNING_DISABLED
      when: never
    - if: $CI_MERGE_REQUEST_ID ||
          $CI_COMMIT_TAG ||
          $CI_PIPELINE_SOURCE == "schedule"
      when: never
    - if: $CI_COMMIT_BRANCH &&
          $GITLAB_FEATURES =~ /\bcontainer_scanning\b/