CI: Cleanup - Remove security related steps (#70788)
* Remove security related steps * More cleanup
This commit is contained in:
@@ -1130,7 +1130,7 @@ def fetch_images_step(edition):
|
||||
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
|
||||
}
|
||||
|
||||
def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None):
|
||||
def publish_images_step(edition, ver_mode, docker_repo, trigger = None):
|
||||
"""Generates a step for publishing public Docker images with grabpl.
|
||||
|
||||
Args:
|
||||
@@ -1138,7 +1138,6 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None):
|
||||
It also controls which publishing implementation is used.
|
||||
ver_mode: controls whether the image needs to be built or retrieved from a previous build.
|
||||
If ver_mode == 'release', the previously built image is fetched instead of being built again.
|
||||
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.
|
||||
trigger: a Drone trigger for the pipeline.
|
||||
@@ -1149,10 +1148,6 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None):
|
||||
"""
|
||||
name = docker_repo
|
||||
docker_repo = "grafana/{}".format(docker_repo)
|
||||
if mode == "security":
|
||||
mode = "--{} ".format(mode)
|
||||
else:
|
||||
mode = ""
|
||||
|
||||
environment = {
|
||||
"GCP_KEY": from_secret("gcp_key"),
|
||||
@@ -1163,8 +1158,7 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None):
|
||||
"GITHUB_APP_PRIVATE_KEY": from_secret("delivery-bot-app-private-key"),
|
||||
}
|
||||
|
||||
cmd = "./bin/grabpl artifacts docker publish {}--dockerhub-repo {}".format(
|
||||
mode,
|
||||
cmd = "./bin/grabpl artifacts docker publish --dockerhub-repo {}".format(
|
||||
docker_repo,
|
||||
)
|
||||
|
||||
@@ -1654,21 +1648,6 @@ def trigger_test_release():
|
||||
},
|
||||
}
|
||||
|
||||
def artifacts_page_step():
|
||||
return {
|
||||
"name": "artifacts-page",
|
||||
"image": images["build_image"],
|
||||
"depends_on": [
|
||||
"compile-build-cmd",
|
||||
],
|
||||
"environment": {
|
||||
"GCP_KEY": from_secret("gcp_key"),
|
||||
},
|
||||
"commands": [
|
||||
"./bin/build artifacts-page",
|
||||
],
|
||||
}
|
||||
|
||||
def end_to_end_tests_deps():
|
||||
return [
|
||||
"end-to-end-tests-dashboards-suite",
|
||||
|
||||
Reference in New Issue
Block a user