[v9.3.x] Backport #65797 and #65806 to v9.3.x (#65856)

* CI: Make `init-enterprise` depend on `grabpl` (#65797)

Make init-enterprise depend on grabpl

# Conflicts:
#	.drone.yml

(cherry picked from commit 821633c796)

# Conflicts:
#	.drone.yml

* CI: Exclude cloud related tags from tag events  (#65806)

* Exclude cloud related tags

* Fix starlark lint errors

(cherry picked from commit a18ea77aac)

# Conflicts:
#	.drone.yml
This commit is contained in:
Dimitris Sotirakis
2023-04-04 08:36:42 +02:00
committed by GitHub
parent 1bf4a3e2b1
commit c9882623f5
4 changed files with 76 additions and 27 deletions
+61 -22
View File
@@ -2366,7 +2366,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -2423,7 +2426,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -2497,7 +2503,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -2560,7 +2569,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -2613,6 +2625,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -2851,7 +2864,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -2874,6 +2890,12 @@ platform:
os: linux
services: []
steps:
- commands:
- mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
- chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8
name: grabpl
- commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise
@@ -2894,6 +2916,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -2903,12 +2926,6 @@ steps:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
name: identify-runner
- commands:
- mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
- chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8
name: grabpl
- commands:
- yarn install --immutable
depends_on:
@@ -2936,7 +2953,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -2985,6 +3005,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -3044,7 +3065,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -3127,7 +3151,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -3180,6 +3207,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -3371,7 +3399,10 @@ trigger:
exclude:
- promote
ref:
- refs/tags/v*
exclude:
- refs/tags/*-cloud*
include:
- refs/tags/v*
type: docker
volumes:
- host:
@@ -3430,6 +3461,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -4452,6 +4484,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -5105,6 +5138,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -5376,6 +5410,12 @@ platform:
os: linux
services: []
steps:
- commands:
- mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
- chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8
name: grabpl
- commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise
@@ -5395,6 +5435,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -5404,12 +5445,6 @@ steps:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
name: identify-runner
- commands:
- mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
- chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8
name: grabpl
- commands:
- yarn install --immutable
depends_on:
@@ -5482,6 +5517,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -5616,6 +5652,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -5836,6 +5873,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -6228,6 +6266,7 @@ steps:
- mv /tmp/grabpl bin/
depends_on:
- clone-enterprise
- grabpl
environment:
GITHUB_TOKEN:
from_secret: github_token
@@ -6614,6 +6653,6 @@ kind: secret
name: enterprise2_security_prefix
---
kind: signature
hmac: f4ea70427c5175e11a5f97cae6364d02e1bdb1f6a431325cc9ef083dee4c7751
hmac: 9b71733a5b0ba599d7863d6b4b8398f512d6b23f5fb4b70771ded64cbdec08f1
...
+13 -4
View File
@@ -65,10 +65,19 @@ load("scripts/drone/vault.star", "from_secret", "prerelease_bucket")
ver_mode = "release"
release_trigger = {
"event": {"exclude": ["promote"]},
"ref": [
"refs/tags/v*",
],
"event": {
"exclude": [
"promote",
],
},
"ref": {
"include": [
"refs/tags/v*",
],
"exclude": [
"refs/tags/*-cloud*",
],
},
}
def store_npm_packages_step():
+1 -1
View File
@@ -78,10 +78,10 @@ def test_frontend_enterprise(trigger, ver_mode, source, edition = "enterprise"):
environment = {"EDITION": edition}
steps = (
[
download_grabpl_step(),
clone_enterprise_step(source),
init_enterprise_step(ver_mode),
identify_runner_step(),
download_grabpl_step(),
] +
with_deps([yarn_install_step()], ["init-enterprise"]) +
[
+1
View File
@@ -171,6 +171,7 @@ def init_enterprise_step(ver_mode):
"image": build_image,
"depends_on": [
"clone-enterprise",
"grabpl",
],
"environment": environment,
"commands": [