CI: Cleanup - Remove security related steps (#70788)

* Remove security related steps

* More cleanup
This commit is contained in:
Dimitris Sotirakis
2023-06-28 11:12:47 +03:00
committed by GitHub
parent dde4a03544
commit 7f55ba9c6e
7 changed files with 24 additions and 295 deletions
-3
View File
@@ -112,14 +112,12 @@ def build_e2e(trigger, ver_mode):
publish_images_step(
docker_repo = "grafana",
edition = edition,
mode = "",
trigger = trigger_oss,
ver_mode = ver_mode,
),
publish_images_step(
docker_repo = "grafana-oss",
edition = edition,
mode = "",
trigger = trigger_oss,
ver_mode = ver_mode,
),
@@ -155,7 +153,6 @@ def build_e2e(trigger, ver_mode):
publish_images_step(
docker_repo = "grafana",
edition = edition,
mode = "",
trigger = trigger_oss,
ver_mode = ver_mode,
),
+4 -26
View File
@@ -15,14 +15,13 @@ load(
"pipeline",
)
def publish_image_steps(edition, mode, docker_repo):
def publish_image_steps(edition, docker_repo):
"""Generates the steps used for publising Docker images using grabpl.
Args:
edition: controls which version of an image is fetched in the case of a release.
It also controls which publishing implementation is used.
If edition == 'oss', it additionally publishes the grafana/grafana-oss repository.
mode: uses to control the publishing of security images when mode == 'security'.
docker_repo: the Docker image name.
It is combined with the 'grafana/' library prefix.
@@ -34,12 +33,12 @@ def publish_image_steps(edition, mode, docker_repo):
download_grabpl_step(),
compile_build_cmd(),
fetch_images_step(edition),
publish_images_step(edition, "release", mode, docker_repo),
publish_images_step(edition, "release", docker_repo),
]
if edition == "oss":
steps.append(
publish_images_step(edition, "release", mode, "grafana-oss"),
publish_images_step(edition, "release", "grafana-oss"),
)
return steps
@@ -59,7 +58,7 @@ def publish_image_pipelines_public():
pipeline(
name = "publish-docker-oss-{}".format(mode),
trigger = trigger,
steps = publish_image_steps(edition = "oss", mode = mode, docker_repo = "grafana"),
steps = publish_image_steps(edition = "oss", docker_repo = "grafana"),
edition = "",
environment = {"EDITION": "oss"},
),
@@ -68,27 +67,6 @@ def publish_image_pipelines_public():
trigger = trigger,
steps = publish_image_steps(
edition = "enterprise",
mode = mode,
docker_repo = "grafana-enterprise",
),
edition = "",
environment = {"EDITION": "enterprise"},
),
]
def publish_image_pipelines_security():
mode = "security"
trigger = {
"event": ["promote"],
"target": [mode],
}
return [
pipeline(
name = "publish-docker-enterprise-{}".format(mode),
trigger = trigger,
steps = publish_image_steps(
edition = "enterprise",
mode = mode,
docker_repo = "grafana-enterprise",
),
edition = "",