diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 09:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 09:09:49 +0300 |
| commit | 99454db49e04656e8df692c5a1c4582fec50eee3 (patch) | |
| tree | 4964dd66b90e7893ba623c37d1cd03fe1b33658f /lib | |
| parent | 2e4d8b3449e8c2c750a816b9566c61a0a96b934b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Secure-Binaries.gitlab-ci.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/gitlab/ci/templates/Security/Secure-Binaries.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Secure-Binaries.gitlab-ci.yml index 479ca363ed3..5a29ced2314 100644 --- a/lib/gitlab/ci/templates/Security/Secure-Binaries.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Secure-Binaries.gitlab-ci.yml @@ -44,9 +44,8 @@ variables: - mkdir -p output/$(dirname ${CI_JOB_NAME}) - | if [ "$SECURE_BINARIES_SAVE_ARTIFACTS" = "true" ]; then - docker save ${SECURE_BINARIES_IMAGE} -o output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tar - gzip output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tar - sha256sum output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tar.gz > output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tag.gz.sha256sum + docker save ${SECURE_BINARIES_IMAGE} | gzip > output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tar.gz + sha256sum output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tar.gz > output/${CI_JOB_NAME}_${SECURE_BINARIES_ANALYZER_VERSION}.tar.gz.sha256sum fi - | if [ "$SECURE_BINARIES_PUSH_IMAGES" = "true" ]; then @@ -86,9 +85,6 @@ analyzers/gosec: analyzers/spotbugs: extends: .download_images - variables: - # TODO: Spotbugs is > 1GB, disabling for now - SECURE_BINARIES_SAVE_ARTIFACTS: "false" only: variables: - $SECURE_BINARIES_DOWNLOAD_IMAGES == "true" && @@ -231,8 +227,6 @@ license-management: extends: .download_images variables: SECURE_BINARIES_ANALYZER_VERSION: "3" - # TODO: license-management is > 1GB, disabling for now - SECURE_BINARIES_SAVE_ARTIFACTS: "false" only: variables: - $SECURE_BINARIES_DOWNLOAD_IMAGES == "true" && |