From 22544bd135a96a9404673cd9abae1be6e779a775 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Tue, 1 Jun 2021 07:29:52 -0400 Subject: [PATCH] Fix enterprise autodeploy (#34889) Config file needs to be copied over No-op for OSS grafana --- .drone.yml | 3 +++ scripts/lib.star | 1 + 2 files changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index 9545c869e0d..02f9b8f589f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1097,6 +1097,7 @@ steps: - rmdir bin - mv grafana-enterprise /tmp/ - /tmp/grabpl init-enterprise /tmp/grafana-enterprise ${DRONE_TAG} + - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json - mkdir bin - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone @@ -2041,6 +2042,7 @@ steps: - rmdir bin - mv grafana-enterprise /tmp/ - /tmp/grabpl init-enterprise /tmp/grafana-enterprise + - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json - mkdir bin - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone @@ -2950,6 +2952,7 @@ steps: - rmdir bin - mv grafana-enterprise /tmp/ - /tmp/grabpl init-enterprise /tmp/grafana-enterprise + - mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json - mkdir bin - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone diff --git a/scripts/lib.star b/scripts/lib.star index f6149042a72..ad8d087e6f9 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -161,6 +161,7 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr 'rmdir bin', 'mv grafana-enterprise /tmp/', '/tmp/grabpl init-enterprise /tmp/grafana-enterprise{}'.format(source_commit), + 'mv /tmp/grafana-enterprise/deployment_tools_config.json deployment_tools_config.json', 'mkdir bin', 'mv /tmp/grabpl bin/' ] + common_cmds,