public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drone: Use ${DRONE_TAG} in release pipelines, since it should work (#28299)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-10-16 12:54:41 +02:00
committed by GitHub
parent f989e37132
commit 392c5bdf73
3 changed files with 30 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib.star
+9 -18
View File
@@ -8,8 +8,6 @@ dockerize_version = '0.6.1'
wix_image = 'grafana/ci-wix:0.1.1'
test_release_ver = 'v7.3.0-test'
drone_tag_cmd = 'export DRONE_TAG=$$(./bin/grabpl parse-tag-ref ${DRONE_COMMIT_REF})'
def pipeline(
name, edition, trigger, steps, ver_mode, services=[], platform='linux', depends_on=[],
is_downstream=False, install_deps=True,
@@ -100,8 +98,7 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
pre_cmds = []
if ver_mode == 'release':
pre_cmds.append(drone_tag_cmd)
common_cmds.append('./bin/grabpl verify-version $${DRONE_TAG}')
common_cmds.append('./bin/grabpl verify-version ${DRONE_TAG}')
elif ver_mode == 'test-release':
common_cmds.append('./bin/grabpl verify-version {}'.format(test_release_ver))
@@ -122,8 +119,8 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
])
if edition == 'enterprise':
if ver_mode == 'release':
committish = '$${DRONE_TAG}'
source_commit = ' $${DRONE_TAG}'
committish = '${DRONE_TAG}'
source_commit = ' ${DRONE_TAG}'
elif ver_mode == 'test-release':
committish = 'master'
source_commit = ''
@@ -283,8 +280,7 @@ def publish_storybook_step(edition, ver_mode):
else:
commands = []
if ver_mode == 'release':
channels = ['latest', '$${DRONE_TAG}',]
commands.append(drone_tag_cmd)
channels = ['latest', '${DRONE_TAG}',]
else:
channels = ['canary',]
commands.extend([
@@ -323,8 +319,7 @@ def build_backend_step(edition, ver_mode, variants=None, is_downstream=False):
},
}
cmds = [
drone_tag_cmd,
'./bin/grabpl build-backend --jobs 8 --edition {} --github-token $${{GITHUB_TOKEN}} --no-pull-enterprise $${{DRONE_TAG}}'.format(
'./bin/grabpl build-backend --jobs 8 --edition {} --github-token $${{GITHUB_TOKEN}} --no-pull-enterprise ${{DRONE_TAG}}'.format(
edition,
),
]
@@ -372,9 +367,8 @@ def build_frontend_step(edition, ver_mode, is_downstream=False):
# TODO: Use percentage for num jobs
if ver_mode == 'release':
cmds = [
drone_tag_cmd,
'./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps ' + \
'--edition {} --no-pull-enterprise $${{DRONE_TAG}}'.format(edition),
'--edition {} --no-pull-enterprise ${{DRONE_TAG}}'.format(edition),
]
elif ver_mode == 'test-release':
cmds = [
@@ -557,9 +551,8 @@ def package_step(edition, ver_mode, variants=None, is_downstream=False):
# TODO: Use percentage for jobs
if ver_mode == 'release':
cmds = [
drone_tag_cmd,
'{}./bin/grabpl package --jobs 8 --edition {} '.format(test_args, edition) + \
'--github-token $${{GITHUB_TOKEN}} --no-pull-enterprise{} $${{DRONE_TAG}}'.format(
'--github-token $${{GITHUB_TOKEN}} --no-pull-enterprise{} ${{DRONE_TAG}}'.format(
sign_args
),
]
@@ -847,8 +840,6 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
source_commit = ' $$env:SOURCE_COMMIT'
pre_cmds = []
if ver_mode == 'release':
pre_cmds.append('$$env:DRONE_TAG=$$(.\\grabpl.exe parse-tag-ref ${DRONE_TAG})')
sfx = ''
if edition == 'enterprise':
sfx = '-enterprise'
@@ -869,7 +860,7 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
bucket_part = ''
bucket = 'grafana-downloads'
if ver_mode == 'release':
ver_part = '$$env:DRONE_TAG'
ver_part = '${DRONE_TAG}'
dir = 'release'
elif ver_mode == 'test-release':
ver_part = test_release_ver
@@ -912,7 +903,7 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
if edition == 'enterprise':
if ver_mode == 'release':
committish = '$$env:DRONE_TAG'
committish = '${DRONE_TAG}'
elif ver_mode == 'test-release':
committish = 'master'
else:
scripts/release.star
+3 -5
View File
@@ -29,7 +29,6 @@ load(
'publish_packages_step',
'notify_pipeline',
'integration_test_services',
'drone_tag_cmd',
)
def release_npm_packages_step(edition, ver_mode):
@@ -41,7 +40,7 @@ def release_npm_packages_step(edition, ver_mode):
'echo "//registry.npmjs.org/:_authToken=$${NPM_TOKEN}" >> ~/.npmrc',
]
if ver_mode == 'release':
commands.extend([drone_tag_cmd, './scripts/build/release-packages.sh $${DRONE_TAG}',])
commands.append('./scripts/build/release-packages.sh ${DRONE_TAG}')
return {
'name': 'release-npm-packages',
@@ -140,9 +139,8 @@ def release_pipelines():
},
},
'commands': [
drone_tag_cmd,
'./bin/grabpl publish-packages --edition oss $${DRONE_TAG}',
'./bin/grabpl publish-packages --edition enterprise $${DRONE_TAG}',
'./bin/grabpl publish-packages --edition oss ${DRONE_TAG}',
'./bin/grabpl publish-packages --edition enterprise ${DRONE_TAG}',
],
},
], depends_on=[p['name'] for p in oss_pipelines + enterprise_pipelines], install_deps=False,