CI: rgm-package must wait for update-package-json-version in main pip… (#77022)

CI: rgm-package must wait for update-package-json-version in main pipeline
This commit is contained in:
Horst Gutmann
2023-10-24 11:52:14 +03:00
committed by GitHub
parent fbbc524cb6
commit bd2b4e956b
3 changed files with 6 additions and 5 deletions
+2 -1
View File
@@ -70,17 +70,18 @@ def build_e2e(trigger, ver_mode):
[
build_frontend_package_step(),
enterprise_downstream_step(ver_mode = ver_mode),
rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
],
)
else:
build_steps.extend([
update_package_json_version(),
build_frontend_package_step(depends_on = ["update-package-json-version"]),
rgm_package_step(depends_on = ["update-package-json-version"], distros = "linux/amd64,linux/arm64", file = "packages.txt"),
])
build_steps.extend(
[
rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
grafana_server_step(),
e2e_tests_step("dashboards-suite"),
e2e_tests_step("smoke-tests-suite"),
+2 -2
View File
@@ -9,12 +9,12 @@ load(
)
# rgm_package_step will create a tar.gz for use in e2e tests or other PR testing related activities..
def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"):
def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt", depends_on = ["yarn-install"]):
return {
"name": "rgm-package",
"image": "grafana/grafana-build:main",
"pull": "always",
"depends_on": ["yarn-install"],
"depends_on": depends_on,
"commands": [
"/src/grafana-build package --distro={} ".format(distros) +
"--go-version={} ".format(golang_version) +