AzureMonitor - E2E tests drone update (#57100)
* Update e2e command with video flag * Add Cloud Plugins E2E tests to drone * Update env variable names * Add vault Azure secrets * Update e2e steps * Update secrets path * Update image and rebuild drone file * Readd drone changes * Rebuild drone * Remake drone * Correct reference to secret * Remake drone file * Remove unneeded step * Clear values in Arg query
This commit is contained in:
@@ -36,6 +36,7 @@ load(
|
||||
'betterer_frontend_step',
|
||||
'trigger_test_release',
|
||||
'compile_build_cmd',
|
||||
'cloud_plugins_e2e_tests_step',
|
||||
)
|
||||
|
||||
load(
|
||||
@@ -75,6 +76,7 @@ def build_e2e(trigger, ver_mode, edition):
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition),
|
||||
e2e_tests_step('panels-suite', edition=edition),
|
||||
e2e_tests_step('various-suite', edition=edition),
|
||||
cloud_plugins_e2e_tests_step('cloud-plugins-suite', edition=edition, cloud='azure', trigger=trigger_oss),
|
||||
e2e_tests_artifacts(edition=edition),
|
||||
build_storybook_step(edition=edition, ver_mode=ver_mode),
|
||||
copy_packages_for_docker_step(),
|
||||
|
||||
@@ -731,6 +731,41 @@ def e2e_tests_step(suite, edition, port=3001, tries=None):
|
||||
],
|
||||
}
|
||||
|
||||
def cloud_plugins_e2e_tests_step(suite, edition, cloud, port=3001, video="false", trigger=None):
|
||||
environment = {}
|
||||
when = {}
|
||||
if trigger:
|
||||
when = trigger
|
||||
if cloud == 'azure':
|
||||
environment = {
|
||||
'CYPRESS_CI': 'true',
|
||||
'HOST': 'grafana-server' + enterprise2_suffix(edition),
|
||||
'GITHUB_TOKEN': from_secret('github_token_pr'),
|
||||
'AZURE_SP_APP_ID': from_secret('azure_sp_app_id'),
|
||||
'AZURE_SP_PASSWORD': from_secret('azure_sp_app_pw'),
|
||||
'AZURE_TENANT': from_secret('azure_tenant')
|
||||
}
|
||||
when= dict(when, paths={
|
||||
'include' : [
|
||||
'pkg/tsdb/azuremonitor/**',
|
||||
'public/app/plugins/datasource/grafana-azure-monitor-datasource/**'
|
||||
]
|
||||
})
|
||||
branch = "${DRONE_SOURCE_BRANCH}".replace("/", "-")
|
||||
step = {
|
||||
'name': 'end-to-end-tests-{}-{}'.format(suite, cloud) + enterprise2_suffix(edition),
|
||||
'image': 'us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:latest',
|
||||
'depends_on': [
|
||||
'grafana-server',
|
||||
],
|
||||
'environment': environment,
|
||||
'commands': [
|
||||
'cd /',
|
||||
'./cpp-e2e/scripts/ci-run.sh {} {}'.format(cloud, branch)
|
||||
],
|
||||
}
|
||||
step = dict(step, when=when)
|
||||
return step
|
||||
|
||||
def build_docs_website_step():
|
||||
return {
|
||||
|
||||
@@ -3,6 +3,9 @@ github_token = 'github_token'
|
||||
drone_token = 'drone_token'
|
||||
prerelease_bucket = 'prerelease_bucket'
|
||||
gcp_upload_artifacts_key = 'gcp_upload_artifacts_key'
|
||||
azure_sp_app_id = 'azure_sp_app_id'
|
||||
azure_sp_app_pw = 'azure_sp_app_pw'
|
||||
azure_tenant = 'azure_tenant'
|
||||
|
||||
def from_secret(secret):
|
||||
return {
|
||||
@@ -26,6 +29,9 @@ def secrets():
|
||||
vault_secret(drone_token, 'infra/data/ci/drone', 'machine-user-token'),
|
||||
vault_secret(prerelease_bucket, 'infra/data/ci/grafana/prerelease', 'bucket'),
|
||||
vault_secret(gcp_upload_artifacts_key, 'infra/data/ci/grafana/releng/artifacts-uploader-service-account', 'credentials.json'),
|
||||
vault_secret(azure_sp_app_id, 'infra/data/ci/datasources/cpp-azure-resourcemanager-credentials', 'application_id'),
|
||||
vault_secret(azure_sp_app_pw, 'infra/data/ci/datasources/cpp-azure-resourcemanager-credentials', 'application_secret'),
|
||||
vault_secret(azure_tenant, 'infra/data/ci/datasources/cpp-azure-resourcemanager-credentials', 'tenant_id'),
|
||||
|
||||
# Package publishing
|
||||
vault_secret('packages_gpg_public_key', 'infra/data/ci/packages-publish/gpg', 'public-key'),
|
||||
|
||||
Reference in New Issue
Block a user