CI: Replace TAG with DRONE_TAG in CI (#58894)

* Replace TAG with DRONE_TAG

* Fix variable call

* Replace remaining bits

* Bump grabpl version
This commit is contained in:
Dimitris Sotirakis
2022-11-17 08:30:09 -05:00
committed by GitHub
parent d0dcbe34b2
commit 5ea077c440
3 changed files with 51 additions and 51 deletions
+3 -3
View File
@@ -102,7 +102,7 @@ def retrieve_npm_packages_step():
'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
},
'commands': [
'./bin/grabpl artifacts npm retrieve --tag v${TAG}'
'./bin/grabpl artifacts npm retrieve --tag ${DRONE_TAG}'
],
}
@@ -118,7 +118,7 @@ def release_npm_packages_step():
'NPM_TOKEN': from_secret('npm_token'),
},
'commands': [
'./bin/grabpl artifacts npm release --tag v${TAG}'
'./bin/grabpl artifacts npm release --tag ${DRONE_TAG}'
],
}
@@ -361,7 +361,7 @@ def publish_artifacts_step(mode):
'GCP_KEY': from_secret('gcp_key'),
'PRERELEASE_BUCKET': from_secret('prerelease_bucket'),
},
'commands': ['./bin/grabpl artifacts publish {}--tag ${{TAG}} --src-bucket $${{PRERELEASE_BUCKET}}'.format(security)],
'commands': ['./bin/grabpl artifacts publish {}--tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}}'.format(security)],
'depends_on': ['grabpl'],
}
+2 -2
View File
@@ -1,6 +1,6 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = 'v3.0.16'
grabpl_version = 'v3.0.17'
build_image = 'grafana/build-container:1.6.4'
publish_image = 'grafana/grafana-ci-deploy:1.3.3'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
@@ -848,7 +848,7 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger=None):
if ver_mode == 'release':
deps = ['fetch-images-{}'.format(edition)]
cmd += ' --version-tag ${TAG}'
cmd += ' --version-tag ${DRONE_TAG}'
else:
deps = ['build-docker-images', 'build-docker-images-ubuntu']