mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
CI: Remove unused --github-token flag (#47773)
* Remove github token flag * Minor cleanup * Update grabpl
This commit is contained in:
committed by
GitHub
parent
24468fdd67
commit
508cc58a63
@@ -224,7 +224,7 @@ def get_steps(edition, ver_mode):
|
||||
build_steps.append(build_storybook)
|
||||
|
||||
if include_enterprise2:
|
||||
integration_test_steps.extend([redis_integration_tests_step(edition=edition2, ver_mode=ver_mode), memcached_integration_tests_step(edition=edition2, ver_mode=ver_mode)])
|
||||
integration_test_steps.extend([redis_integration_tests_step(), memcached_integration_tests_step()])
|
||||
|
||||
if should_upload:
|
||||
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss))
|
||||
@@ -431,9 +431,8 @@ def publish_npm_pipelines(mode):
|
||||
name='publish-npm-packages-{}'.format(mode), trigger=trigger, steps = steps, edition="all"
|
||||
)]
|
||||
|
||||
def release_pipelines(ver_mode='release', trigger=None, environment=None):
|
||||
def release_pipelines(ver_mode='release', trigger=None):
|
||||
# 'enterprise' edition services contain both OSS and enterprise services
|
||||
services = integration_test_services(edition='enterprise')
|
||||
if not trigger:
|
||||
trigger = {
|
||||
'event': {
|
||||
@@ -447,8 +446,6 @@ def release_pipelines(ver_mode='release', trigger=None, environment=None):
|
||||
},
|
||||
}
|
||||
|
||||
should_publish = ver_mode == 'release'
|
||||
|
||||
# The release pipelines include also enterprise ones, so both editions are built for a release.
|
||||
# We could also solve this by triggering a downstream build for the enterprise repo, but by including enterprise
|
||||
# in OSS release builds, we simplify the UX for the release engineer.
|
||||
@@ -457,13 +454,6 @@ def release_pipelines(ver_mode='release', trigger=None, environment=None):
|
||||
|
||||
pipelines = oss_pipelines + enterprise_pipelines
|
||||
|
||||
# if ver_mode == 'release':
|
||||
# pipelines.append(publish_artifacts_pipelines())
|
||||
#pipelines.append(notify_pipeline(
|
||||
# name='notify-{}'.format(ver_mode), slack_channel='grafana-ci-notifications', trigger=dict(trigger, status = ['failure']),
|
||||
# depends_on=[p['name'] for p in pipelines], template=failure_template, secret='slack_webhook',
|
||||
#))
|
||||
|
||||
return pipelines
|
||||
|
||||
def get_e2e_suffix():
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
|
||||
|
||||
grabpl_version = 'v2.9.35'
|
||||
grabpl_version = 'v2.9.36'
|
||||
build_image = 'grafana/build-container:1.5.3'
|
||||
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
|
||||
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
|
||||
@@ -368,17 +368,13 @@ def build_backend_step(edition, ver_mode, variants=None):
|
||||
|
||||
# TODO: Convert number of jobs to percentage
|
||||
if ver_mode == 'release':
|
||||
env = {
|
||||
'GITHUB_TOKEN': from_secret(github_token),
|
||||
}
|
||||
cmds = [
|
||||
'./bin/grabpl build-backend --jobs 8 --edition {} --github-token $${{GITHUB_TOKEN}} ${{DRONE_TAG}}'.format(
|
||||
'./bin/grabpl build-backend --jobs 8 --edition {} ${{DRONE_TAG}}'.format(
|
||||
edition,
|
||||
),
|
||||
]
|
||||
else:
|
||||
build_no = '${DRONE_BUILD_NUMBER}'
|
||||
env = {}
|
||||
cmds = [
|
||||
'./bin/grabpl build-backend --jobs 8 --edition {} --build-id {}{}'.format(
|
||||
edition, build_no, variants_str,
|
||||
@@ -388,7 +384,6 @@ def build_backend_step(edition, ver_mode, variants=None):
|
||||
return {
|
||||
'name': 'build-backend' + enterprise2_suffix(edition),
|
||||
'image': build_image,
|
||||
'environment': env,
|
||||
'depends_on': [
|
||||
'gen-version',
|
||||
'wire-install',
|
||||
@@ -403,7 +398,7 @@ def build_frontend_step(edition, ver_mode):
|
||||
# TODO: Use percentage for num jobs
|
||||
if ver_mode == 'release':
|
||||
cmds = [
|
||||
'./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} ' + \
|
||||
'./bin/grabpl build-frontend --jobs 8 ' + \
|
||||
'--edition {} ${{DRONE_TAG}}'.format(edition),
|
||||
]
|
||||
else:
|
||||
@@ -432,7 +427,7 @@ def build_frontend_package_step(edition, ver_mode):
|
||||
# TODO: Use percentage for num jobs
|
||||
if ver_mode == 'release':
|
||||
cmds = [
|
||||
'./bin/grabpl build-frontend-packages --jobs 8 --github-token $${GITHUB_TOKEN} ' + \
|
||||
'./bin/grabpl build-frontend-packages --jobs 8 ' + \
|
||||
'--edition {} ${{DRONE_TAG}}'.format(edition),
|
||||
]
|
||||
else:
|
||||
@@ -654,7 +649,6 @@ def package_step(edition, ver_mode, include_enterprise2=False, variants=None):
|
||||
sign_args = ' --sign'
|
||||
env = {
|
||||
'GRAFANA_API_KEY': from_secret('grafana_api_key'),
|
||||
'GITHUB_TOKEN': from_secret(github_token),
|
||||
'GPG_PRIV_KEY': from_secret('gpg_priv_key'),
|
||||
'GPG_PUB_KEY': from_secret('gpg_pub_key'),
|
||||
'GPG_KEY_PASSWORD': from_secret('gpg_key_password'),
|
||||
@@ -669,7 +663,7 @@ def package_step(edition, ver_mode, include_enterprise2=False, variants=None):
|
||||
if ver_mode == 'release':
|
||||
cmds = [
|
||||
'{}./bin/grabpl package --jobs 8 --edition {} '.format(test_args, edition) + \
|
||||
'--github-token $${{GITHUB_TOKEN}}{} ${{DRONE_TAG}}'.format(
|
||||
'{} ${{DRONE_TAG}}'.format(
|
||||
sign_args
|
||||
),
|
||||
]
|
||||
@@ -884,7 +878,7 @@ def mysql_integration_tests_step(edition, ver_mode):
|
||||
}
|
||||
|
||||
|
||||
def redis_integration_tests_step(edition, ver_mode):
|
||||
def redis_integration_tests_step():
|
||||
deps = []
|
||||
deps.extend(['grabpl'])
|
||||
return {
|
||||
@@ -901,7 +895,7 @@ def redis_integration_tests_step(edition, ver_mode):
|
||||
}
|
||||
|
||||
|
||||
def memcached_integration_tests_step(edition, ver_mode):
|
||||
def memcached_integration_tests_step():
|
||||
deps = []
|
||||
deps.extend(['grabpl'])
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user