Commit 420a5ca8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Revisa jobs de escaneo de contenedores

See merge request redmic-project/gitlab-ci-templates!74
parents 299791bf ab8c9ec4

_packaging.yml

+13 −7
Original line number Diff line number Diff line
@@ -31,15 +31,20 @@ lint-dockerfile: 
      when: never

    - if: $CI_COMMIT_BRANCH



container_scanning_deprecated:

container_scanning:

  stage: post-package

  script: ':'

  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

  script: ':'



container_scanning:

  stage: post-package

  rules:

    - if: $CONTAINER_SCANNING_DISABLED
@@ -49,4 +54,5 @@ container_scanning: 
          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH &&

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

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