diff --git a/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml b/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml index dad00f267a52034d4f5de39c3f1a53361ecc71fb..9fe9931b5948a85e147ce6f659040135e0821656 100644 --- a/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml +++ b/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml @@ -7,7 +7,7 @@ include: stages: - start - images -- scan +- test oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.13.0 @@ -46,7 +46,7 @@ datadog_pipeline_trace: --tags mr_number:$CI_MERGE_REQUEST_IID container_scanning: - stage: scan + stage: test tags: - gcp dependencies: [] @@ -68,7 +68,7 @@ container_scanning: container_scanning_slack_notification: image: ${ci_image_name}/monitoring:${ci_image_tag} - stage: scan + stage: test tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_container_scanning_master.yml b/.gitlab/ci/pipelines/schedule_container_scanning_master.yml index 48583523f8f268cd45195f288805b0f87c5b0137..0c54756915001b01b850a0112b8cb5c8418a5a97 100644 --- a/.gitlab/ci/pipelines/schedule_container_scanning_master.yml +++ b/.gitlab/ci/pipelines/schedule_container_scanning_master.yml @@ -7,7 +7,7 @@ include: stages: - start - images -- scan +- test oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.13.0 @@ -46,7 +46,7 @@ datadog_pipeline_trace: --tags mr_number:$CI_MERGE_REQUEST_IID container_scanning: - stage: scan + stage: test tags: - gcp dependencies: [] @@ -68,7 +68,7 @@ container_scanning: container_scanning_slack_notification: image: ${ci_image_name}/monitoring:${ci_image_tag} - stage: scan + stage: test tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_container_scanning_octez_rc.yml b/.gitlab/ci/pipelines/schedule_container_scanning_octez_rc.yml index 85b4a3049c123af039ca4fc5c1688a35fe7a8fd9..02ddbdfc1540e68ed3a22fc4b6c226fd3bd4db61 100644 --- a/.gitlab/ci/pipelines/schedule_container_scanning_octez_rc.yml +++ b/.gitlab/ci/pipelines/schedule_container_scanning_octez_rc.yml @@ -7,7 +7,7 @@ include: stages: - start - images -- scan +- test oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.13.0 @@ -46,7 +46,7 @@ datadog_pipeline_trace: --tags mr_number:$CI_MERGE_REQUEST_IID container_scanning: - stage: scan + stage: test tags: - gcp dependencies: [] @@ -68,7 +68,7 @@ container_scanning: container_scanning_slack_notification: image: ${ci_image_name}/monitoring:${ci_image_tag} - stage: scan + stage: test tags: - gcp needs: diff --git a/.gitlab/ci/pipelines/schedule_container_scanning_octez_releases.yml b/.gitlab/ci/pipelines/schedule_container_scanning_octez_releases.yml index b6511b328012d87a7ae9e891c512a08ca4b034af..fb6094813ea8b34df1c8de838e04c0b1d53c8a32 100644 --- a/.gitlab/ci/pipelines/schedule_container_scanning_octez_releases.yml +++ b/.gitlab/ci/pipelines/schedule_container_scanning_octez_releases.yml @@ -7,7 +7,7 @@ include: stages: - start - images -- scan +- test oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.13.0 @@ -46,7 +46,7 @@ datadog_pipeline_trace: --tags mr_number:$CI_MERGE_REQUEST_IID container_scanning: - stage: scan + stage: test tags: - gcp dependencies: [] @@ -68,7 +68,7 @@ container_scanning: container_scanning_slack_notification: image: ${ci_image_name}/monitoring:${ci_image_tag} - stage: scan + stage: test tags: - gcp needs: diff --git a/ci/bin/container_scanning.ml b/ci/bin/container_scanning.ml index 15974dd78f2411a4241307fca7bdbd8c2bd66b8f..352f4235e0972748c26eeb4b75a47afe9ccacef0 100644 --- a/ci/bin/container_scanning.ml +++ b/ci/bin/container_scanning.ml @@ -19,7 +19,7 @@ let job_container_scanning ?(dockerfile_path = "build.Dockerfile") docker_image job ~__POS__ ~name:"container_scanning" - ~stage:Stages.scan + ~stage:Stages.test ~template:Jobs_container_scanning ~variables: [ @@ -47,7 +47,7 @@ let job_container_scanning_slack_notification ?dockerfile_path docker_image : ~dependencies: (Dependent [Artifacts (job_container_scanning ?dockerfile_path docker_image)]) - ~stage:Stages.scan + ~stage:Stages.test ~image:Images.CI.monitoring [". ./scripts/ci/container_scanning_slack_notification.sh " ^ docker_image] diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index 24002113793d70469468a13d45f3a13b603d7845..e885c7c38eafd3a12ce413df17d7963dc713f667 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1327,8 +1327,6 @@ module Stages = struct let publishing_tests = Stage.register "publishing_tests" - let scan = Stage.register "scan" - let manual = Stage.register "manual" end diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index 4e345aaa5b6c10207f9ba6ece20cd3e331652343..fbd6e58df706f22f774ce331135abe88173e34f1 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -578,9 +578,6 @@ module Stages : sig val publishing_tests : Stage.t - (* Scanning vulnerabilities of Docker images. *) - val scan : Stage.t - val manual : Stage.t end