From 8bf6b821a631a09daa09d99c401a2fd63a84baf5 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 23 May 2025 21:13:13 +0200 Subject: [PATCH] CI: merge [scan] onto [test] Note that [container_scanning_slack_notification] needs and depends on [container_scanning] but both are on same stage ([scan] before, [test] now). --- .../schedule_container_scanning_evm_node_releases.yml | 6 +++--- .gitlab/ci/pipelines/schedule_container_scanning_master.yml | 6 +++--- .../ci/pipelines/schedule_container_scanning_octez_rc.yml | 6 +++--- .../schedule_container_scanning_octez_releases.yml | 6 +++--- ci/bin/container_scanning.ml | 4 ++-- ci/lib_tezos_ci/tezos_ci.ml | 2 -- ci/lib_tezos_ci/tezos_ci.mli | 3 --- 7 files changed, 14 insertions(+), 19 deletions(-) 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 dad00f267a52..9fe9931b5948 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 48583523f8f2..0c5475691500 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 85b4a3049c12..02ddbdfc1540 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 b6511b328012..fb6094813ea8 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 15974dd78f24..352f4235e097 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 24002113793d..e885c7c38eaf 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 4e345aaa5b6c..fbd6e58df706 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 -- GitLab