From 1da6f79036952097692b6dd081981e589ea58ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 23 Nov 2019 14:03:51 +0900 Subject: [PATCH 1/4] .gitlab-ci.yml: Use gitlab's built-in Dependency Scanning See https://docs.gitlab.com/ee/user/application_security/dependency_scanning/ --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1458d4dd5..821d643c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ include: - template: Code-Quality.gitlab-ci.yml + - template: Dependency-Scanning.gitlab-ci.yml - template: License-Management.gitlab-ci.yml - template: SAST.gitlab-ci.yml @@ -16,6 +17,7 @@ stages: - publish variables: + DS_DISABLE_DIND: "true" SAST_DISABLE_DIND: "true" SAST_GOSEC_LEVEL: 2 PYTEST_ADDOPTS: "--color=yes" From ec11c24abdaf105222e24f94219dbdedf263851f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 23 Nov 2019 17:13:58 +0900 Subject: [PATCH 2/4] WIP --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 821d643c6..1923495a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,8 @@ variables: EXTERNAL_TESTS_COMMAND: "tox -e py{35,36,37}-external -- ${PYTEST_ARGS}" COVERAGE_PREFIX: "${CI_JOB_NAME}." +before_script: + - apt-get update && apt-get install -y cython cython3 ##################################################### # Test stage # From e84bf7326a7f8fc59120885dd87a4906f5af9096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 23 Nov 2019 17:29:21 +0900 Subject: [PATCH 3/4] WIP --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1923495a3..346c53c83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,7 @@ variables: COVERAGE_PREFIX: "${CI_JOB_NAME}." before_script: + - cat /etc/os-release - apt-get update && apt-get install -y cython cython3 ##################################################### From d81862731c42a9265bf0b2ab6f8e2d84c7a98451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 23 Nov 2019 17:32:01 +0900 Subject: [PATCH 4/4] WIP --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 346c53c83..36119bb5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,8 +28,7 @@ variables: COVERAGE_PREFIX: "${CI_JOB_NAME}." before_script: - - cat /etc/os-release - - apt-get update && apt-get install -y cython cython3 + - pip install cython ##################################################### # Test stage #