This commit is contained in:
Matthew McClaskey 2023-11-22 17:04:57 +00:00
parent 3303760b80
commit eae04604e1

View File

@ -138,19 +138,14 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
- apk add bash - apk add bash
- (cd ci-scripts && bash download-trivy) - (cd ci-scripts && bash download-trivy)
- bash ci-scripts/scan image ${ORG_NAME}/image-cache-private:$(arch)-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID} - bash ci-scripts/scan image ${ORG_NAME}/image-cache-private:$(arch)-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID}
{% if FILE_LIMITS %}only:
changes:
{% for FILE in files %}- {{ FILE }}
{% endfor %}{% for FILE in IMAGE.changeFiles %}- {{ FILE }}
{% endfor %}{% endif %}
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: never when: never
- if: $CI_COMMIT_BRANCH =~ /^release\/.*$/ - if: ($CI_COMMIT_BRANCH =~ /^release\/.*$/ || $CI_COMMIT_BRANCH == "develop" || $CI_PIPELINE_SOURCE == "schedule")
when: always {% if FILE_LIMITS %}changes:
- if: $CI_COMMIT_BRANCH == "develop" {% for FILE in files %}- {{ FILE }}
when: always {% endfor %}{% for FILE in IMAGE.changeFiles %}- {{ FILE }}
- if: $CI_PIPELINE_SOURCE == "schedule" {% endfor %}{% endif %}
when: always when: always
- when: manual - when: manual
needs: needs:
@ -174,19 +169,14 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
- apk add bash - apk add bash
- (cd ci-scripts && bash download-trivy) - (cd ci-scripts && bash download-trivy)
- bash ci-scripts/scan image ${ORG_NAME}/image-cache-private:x86_64-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID} - bash ci-scripts/scan image ${ORG_NAME}/image-cache-private:x86_64-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID}
{% if FILE_LIMITS %}only:
changes:
{% for FILE in files %}- {{ FILE }}
{% endfor %}{% for FILE in IMAGE.changeFiles %}- {{ FILE }}
{% endfor %}{% endif %}
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: never when: never
- if: $CI_COMMIT_BRANCH =~ /^release\/.*$/ - if: ($CI_COMMIT_BRANCH =~ /^release\/.*$/ || $CI_COMMIT_BRANCH == "develop" || $CI_PIPELINE_SOURCE == "schedule")
when: always {% if FILE_LIMITS %}changes:
- if: $CI_COMMIT_BRANCH == "develop" {% for FILE in files %}- {{ FILE }}
when: always {% endfor %}{% for FILE in IMAGE.changeFiles %}- {{ FILE }}
- if: $CI_PIPELINE_SOURCE == "schedule" {% endfor %}{% endif %}
when: always when: always
- when: manual - when: manual
needs: needs: