Commit 145f45d4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Arregla job de escaneo de contenedores para v14

See merge request redmic-project/gitlab-ci-templates!75
parents 420a5ca8 904ec63d

_packaging.yml

+3 −18
Original line number Diff line number Diff line
@@ -34,25 +34,10 @@ lint-dockerfile: 
container_scanning:

  stage: post-package

  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/ &&

          $CS_MAJOR_VERSION =~ /^[0-3]$/



container_scanning_new:

  stage: post-package

  rules:

    - if: $CONTAINER_SCANNING_DISABLED

      when: never

    - if: $CI_MERGE_REQUEST_ID ||

    - if: $CONTAINER_SCANNING_DISABLED ||

          $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH &&

          $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ &&

          $CS_MAJOR_VERSION !~ /^[0-3]$/
 
          $GITLAB_FEATURES =~ /\bcontainer_scanning\b/