CI: Move windows-tests into promotion pipeline (#68218)

This commit is contained in:
Horst Gutmann
2023-05-10 16:16:59 +02:00
committed by GitHub
parent 260c4544cb
commit acd02e8a48
7 changed files with 84 additions and 304 deletions

View File

@@ -32,7 +32,6 @@ load(
load(
"scripts/drone/pipelines/windows.star",
"windows",
"windows_test_backend",
)
load(
"scripts/drone/pipelines/trigger_downstream.star",
@@ -90,8 +89,6 @@ def main_pipelines():
build_e2e(trigger, ver_mode),
integration_tests(trigger, prefix = ver_mode, ver_mode = ver_mode),
windows(trigger, edition = "oss", ver_mode = ver_mode),
windows_test_backend(trigger, "oss", ver_mode),
windows_test_backend(trigger, "enterprise", ver_mode),
notify_pipeline(
name = "notify-drone-changes",
slack_channel = "slack-webhooks-test",

View File

@@ -15,10 +15,6 @@ load(
"scripts/drone/pipelines/integration_tests.star",
"integration_tests",
)
load(
"scripts/drone/pipelines/windows.star",
"windows_test_backend",
)
load(
"scripts/drone/pipelines/build.star",
"build_e2e",
@@ -104,13 +100,6 @@ def pr_pipelines():
),
ver_mode,
),
windows_test_backend(
get_pr_trigger(
exclude_paths = ["pkg/**", "packaging/**", "go.sum", "go.mod"],
),
"oss",
ver_mode,
),
lint_backend_pipeline(
get_pr_trigger(
include_paths = [

View File

@@ -61,10 +61,6 @@ load(
"test_backend",
"test_backend_enterprise",
)
load(
"scripts/drone/pipelines/windows.star",
"windows_test_backend",
)
load("scripts/drone/vault.star", "from_secret", "prerelease_bucket")
ver_mode = "release"
@@ -237,9 +233,6 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger):
]
if ver_mode not in ("release"):
pipelines.append(windows_test_backend(trigger, "oss", ver_mode))
pipelines.append(windows_test_backend(trigger, "enterprise", ver_mode))
windows_pipeline_dependencies.append("{}-oss-test-backend-windows".format(ver_mode))
pipelines.append(pipeline(
name = "{}-oss-integration-tests".format(ver_mode),
edition = "oss",

View File

@@ -9,6 +9,7 @@ load(
load(
"scripts/drone/steps/lib.star",
"get_windows_steps",
"windows_clone_step",
"windows_go_image",
"windows_init_enterprise_steps",
"windows_test_backend_step",
@@ -26,7 +27,9 @@ def windows_test_backend(trigger, edition, ver_mode):
A single pipeline running backend tests for Windows
"""
environment = {"EDITION": edition}
steps = []
steps = [
windows_clone_step(),
]
if edition == "enterprise":
steps.extend(windows_init_enterprise_steps(ver_mode))
@@ -34,6 +37,7 @@ def windows_test_backend(trigger, edition, ver_mode):
steps.extend([{
"name": "windows-init",
"image": windows_go_image,
"depends_on": ["clone"],
"commands": [],
}])
@@ -41,7 +45,7 @@ def windows_test_backend(trigger, edition, ver_mode):
windows_wire_install_step(edition),
windows_test_backend_step(),
])
return pipeline(
pl = pipeline(
name = "{}-{}-test-backend-windows".format(ver_mode, edition),
edition = edition,
trigger = trigger,
@@ -50,6 +54,10 @@ def windows_test_backend(trigger, edition, ver_mode):
platform = "windows",
environment = environment,
)
pl["clone"] = {
"disable": True,
}
return pl
def windows(trigger, edition, ver_mode):
"""Generates the pipeline used for building Grafana on Windows.

View File

@@ -688,7 +688,6 @@ def test_backend_step(image = build_image):
def windows_test_backend_step():
step = test_backend_step(image = windows_go_image)
step["failure"] = "ignore"
return step
def test_backend_integration_step():
@@ -1371,6 +1370,19 @@ def publish_linux_packages_step(edition, package_manager = "deb"):
},
}
def windows_clone_step():
return {
"name": "clone",
"image": wix_image,
"environment": {
"GITHUB_TOKEN": from_secret("github_token"),
},
"commands": [
'git clone "https://$$env:GITHUB_TOKEN@github.com/$$env:DRONE_REPO.git" .',
"git checkout -f $$env:DRONE_COMMIT",
],
}
def get_windows_steps(edition, ver_mode):
"""Generate the list of Windows steps.