From 742b2374bf87b32aeb53aaf268a52a82d793e0b0 Mon Sep 17 00:00:00 2001 From: Olivier Gonzalez <52092-gonzoyumo@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 15:46:27 +0000 Subject: Configure Secret Detection --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88849c1..5e1c7c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ include: - template: Dependency-Scanning.gitlab-ci.yml - template: Jobs/Code-Quality.gitlab-ci.yml - template: License-Scanning.gitlab-ci.yml + - template: Secret-Detection.gitlab-ci.yml - local: .gitlab/deb.yml - local: .gitlab/build.yml - local: .gitlab/test.yml -- cgit v1.2.3 From cf013ba6e2e2493d431b916a8928ad44b0175fef Mon Sep 17 00:00:00 2001 From: Olivier Gonzalez <52092-gonzoyumo@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 17:02:51 +0000 Subject: Debug secret detection --- .gitlab-ci.yml | 91 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e1c7c1..815c75f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,56 +6,57 @@ variables: GIT_STRATEGY: fetch MAJOR: 3 TMP_IMAGE: $CI_REGISTRY_IMAGE/license-finder:$CI_COMMIT_SHA - + SECURE_LOG_LEVEL: debug + include: - - template: Container-Scanning.gitlab-ci.yml - - template: Dependency-Scanning.gitlab-ci.yml - - template: Jobs/Code-Quality.gitlab-ci.yml - - template: License-Scanning.gitlab-ci.yml + # - template: Container-Scanning.gitlab-ci.yml + # - template: Dependency-Scanning.gitlab-ci.yml + # - template: Jobs/Code-Quality.gitlab-ci.yml + # - template: License-Scanning.gitlab-ci.yml - template: Secret-Detection.gitlab-ci.yml - - local: .gitlab/deb.yml - - local: .gitlab/build.yml - - local: .gitlab/test.yml - - local: .gitlab/deploy.yml - - local: .gitlab/maintenance.yml + # - local: .gitlab/deb.yml + # - local: .gitlab/build.yml + # - local: .gitlab/test.yml + # - local: .gitlab/deploy.yml + # - local: .gitlab/maintenance.yml -stages: - - deb - - build - - test - - deploy - - maintenance +# stages: +# - deb +# - build +# - test +# - deploy +# - maintenance -default: - image: - name: $TMP_IMAGE - entrypoint: [""] - tags: [gitlab-org] +# default: +# image: +# name: $TMP_IMAGE +# entrypoint: [""] +# tags: [gitlab-org] -container_scanning: - variables: - CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/license-finder # only predefined variables are parameter-expanded (no $TMP_IMAGE) - needs: ['build-docker-image'] +# container_scanning: +# variables: +# CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/license-finder # only predefined variables are parameter-expanded (no $TMP_IMAGE) +# needs: ['build-docker-image'] -code_quality: - before_script: - - rm .rubocop.yml - services: - - docker:stable-dind - tags: [gitlab-org-docker] +# code_quality: +# before_script: +# - rm .rubocop.yml +# services: +# - docker:stable-dind +# tags: [gitlab-org-docker] -dependency_scanning: - services: - - docker:stable-dind - tags: [gitlab-org-docker] - needs: [] +# dependency_scanning: +# services: +# - docker:stable-dind +# tags: [gitlab-org-docker] +# needs: [] -license_scanning: - image: - name: $TMP_IMAGE - before_script: - - apt-get check - variables: - LM_REPORT_VERSION: '2.1' - needs: ['build-docker-image'] - allow_failure: false +# license_scanning: +# image: +# name: $TMP_IMAGE +# before_script: +# - apt-get check +# variables: +# LM_REPORT_VERSION: '2.1' +# needs: ['build-docker-image'] +# allow_failure: false -- cgit v1.2.3 From 1af24204ab6c4c7dacbe1daa60a1b5a5279f4e5d Mon Sep 17 00:00:00 2001 From: Olivier Gonzalez <52092-gonzoyumo@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 17:04:19 +0000 Subject: Set git_depth to 2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 815c75f..89e69c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # improved performance. variables: DOCKER_DRIVER: overlay2 - GIT_DEPTH: "1" + GIT_DEPTH: "2" GIT_STRATEGY: fetch MAJOR: 3 TMP_IMAGE: $CI_REGISTRY_IMAGE/license-finder:$CI_COMMIT_SHA -- cgit v1.2.3 From df6b8ca431677a8a9c6af83521e562d3938a64c2 Mon Sep 17 00:00:00 2001 From: Olivier Gonzalez <52092-gonzoyumo@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 17:05:36 +0000 Subject: restore CI config --- .gitlab-ci.yml | 89 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89e69c8..55cf930 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,57 +6,56 @@ variables: GIT_STRATEGY: fetch MAJOR: 3 TMP_IMAGE: $CI_REGISTRY_IMAGE/license-finder:$CI_COMMIT_SHA - SECURE_LOG_LEVEL: debug include: - # - template: Container-Scanning.gitlab-ci.yml - # - template: Dependency-Scanning.gitlab-ci.yml - # - template: Jobs/Code-Quality.gitlab-ci.yml - # - template: License-Scanning.gitlab-ci.yml + - template: Container-Scanning.gitlab-ci.yml + - template: Dependency-Scanning.gitlab-ci.yml + - template: Jobs/Code-Quality.gitlab-ci.yml + - template: License-Scanning.gitlab-ci.yml - template: Secret-Detection.gitlab-ci.yml - # - local: .gitlab/deb.yml - # - local: .gitlab/build.yml - # - local: .gitlab/test.yml - # - local: .gitlab/deploy.yml - # - local: .gitlab/maintenance.yml + - local: .gitlab/deb.yml + - local: .gitlab/build.yml + - local: .gitlab/test.yml + - local: .gitlab/deploy.yml + - local: .gitlab/maintenance.yml -# stages: -# - deb -# - build -# - test -# - deploy -# - maintenance +stages: + - deb + - build + - test + - deploy + - maintenance -# default: -# image: -# name: $TMP_IMAGE -# entrypoint: [""] -# tags: [gitlab-org] +default: + image: + name: $TMP_IMAGE + entrypoint: [""] + tags: [gitlab-org] -# container_scanning: -# variables: -# CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/license-finder # only predefined variables are parameter-expanded (no $TMP_IMAGE) -# needs: ['build-docker-image'] +container_scanning: + variables: + CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/license-finder # only predefined variables are parameter-expanded (no $TMP_IMAGE) + needs: ['build-docker-image'] -# code_quality: -# before_script: -# - rm .rubocop.yml -# services: -# - docker:stable-dind -# tags: [gitlab-org-docker] +code_quality: + before_script: + - rm .rubocop.yml + services: + - docker:stable-dind + tags: [gitlab-org-docker] -# dependency_scanning: -# services: -# - docker:stable-dind -# tags: [gitlab-org-docker] -# needs: [] +dependency_scanning: + services: + - docker:stable-dind + tags: [gitlab-org-docker] + needs: [] -# license_scanning: -# image: -# name: $TMP_IMAGE -# before_script: -# - apt-get check -# variables: -# LM_REPORT_VERSION: '2.1' -# needs: ['build-docker-image'] -# allow_failure: false +license_scanning: + image: + name: $TMP_IMAGE + before_script: + - apt-get check + variables: + LM_REPORT_VERSION: '2.1' + needs: ['build-docker-image'] + allow_failure: false -- cgit v1.2.3