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

[v8.0.x] Backport 36759 to v8.0.x (#36774)

Browse Source 
* Delete verify-drone from windows

* Sync drone yaml

* Downgrade grabpl version

* Move publish-frontend-metrics step
This commit is contained in:
Dimitris Sotirakis
2021-07-15 09:49:19 +02:00
committed by GitHub
parent beeef8b96b
commit ab1995ff4a
3 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+29 -36
View File
@@ -17,7 +17,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@@ -258,7 +258,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@@ -323,17 +323,6 @@ steps:
depends_on: depends_on:
- initialize - initialize
- name: publish-frontend-metrics
image: grafana/build-container:1.4.1
commands:
- ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
environment:
GRAFANA_MISC_STATS_API_KEY:
from_secret: grafana_misc_stats_api_key
failure: ignore
depends_on:
- initialize
- name: build-backend - name: build-backend
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
@@ -351,6 +340,17 @@ steps:
- initialize - initialize
- test-frontend - test-frontend
- name: publish-frontend-metrics
image: grafana/build-container:1.4.1
commands:
- ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
environment:
GRAFANA_MISC_STATS_API_KEY:
from_secret: grafana_misc_stats_api_key
failure: ignore
depends_on:
- build-frontend
- name: build-plugins - name: build-plugins
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
@@ -589,8 +589,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@@ -639,7 +638,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
environment: environment:
@@ -724,7 +723,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl verify-version ${DRONE_TAG}
@@ -1030,8 +1029,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@@ -1081,7 +1079,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@@ -1506,7 +1504,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
- git checkout ${DRONE_TAG} - git checkout ${DRONE_TAG}
@@ -1523,7 +1521,6 @@ steps:
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
- .\grabpl.exe verify-drone
depends_on: depends_on:
- clone - clone
@@ -1575,7 +1572,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl verify-version ${DRONE_TAG}
@@ -1680,7 +1677,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl verify-version v7.3.0-test
@@ -1975,8 +1972,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@@ -2026,7 +2022,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@@ -2445,7 +2441,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
- git checkout main - git checkout main
@@ -2462,7 +2458,6 @@ steps:
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
- .\grabpl.exe verify-drone
depends_on: depends_on:
- clone - clone
@@ -2514,7 +2509,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl verify-version v7.3.0-test
@@ -2619,7 +2614,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@@ -2889,8 +2884,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@@ -2936,7 +2930,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@@ -3358,7 +3352,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
- git checkout $$env:DRONE_BRANCH - git checkout $$env:DRONE_BRANCH
@@ -3375,7 +3369,6 @@ steps:
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
- .\grabpl.exe verify-drone
depends_on: depends_on:
- clone - clone
scripts/lib.star
+20 -22
View File
@@ -1,6 +1,6 @@
load('scripts/vault.star', 'from_secret', 'github_token', 'pull_secret') load('scripts/vault.star', 'from_secret', 'github_token', 'pull_secret')
grabpl_version = '2.0.0' grabpl_version = '2.2.8'
build_image = 'grafana/build-container:1.4.1' build_image = 'grafana/build-container:1.4.1'
publish_image = 'grafana/grafana-ci-deploy:1.3.1' publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@@ -435,6 +435,25 @@ def build_plugins_step(edition, sign=False):
], ],
} }
def frontend_metrics_step(edition):
if edition in ('enterprise', 'enterprise2'):
return None
return {
'name': 'publish-frontend-metrics',
'image': build_image,
'depends_on': [
'build-frontend',
],
'environment': {
'GRAFANA_MISC_STATS_API_KEY': from_secret('grafana_misc_stats_api_key'),
},
'failure': 'ignore',
'commands': [
'./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}',
],
}
def test_backend_step(edition, tries=None): def test_backend_step(edition, tries=None):
test_backend_cmd = './bin/grabpl test-backend --edition {}'.format(edition) test_backend_cmd = './bin/grabpl test-backend --edition {}'.format(edition)
integration_tests_cmd = './bin/grabpl integration-tests --edition {}'.format(edition) integration_tests_cmd = './bin/grabpl integration-tests --edition {}'.format(edition)
@@ -472,25 +491,6 @@ def test_frontend_step():
], ],
} }
def frontend_metrics_step(edition):
if edition in ('enterprise', 'enterprise2'):
return None
return {
'name': 'publish-frontend-metrics',
'image': build_image,
'depends_on': [
'initialize',
],
'environment': {
'GRAFANA_MISC_STATS_API_KEY': from_secret('grafana_misc_stats_api_key'),
},
'failure': 'ignore',
'commands': [
'./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}',
],
}
def codespell_step(): def codespell_step():
return { return {
@@ -929,7 +929,6 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
init_cmds.extend([ init_cmds.extend([
'$$ProgressPreference = "SilentlyContinue"', '$$ProgressPreference = "SilentlyContinue"',
'Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v{}/windows/grabpl.exe -OutFile grabpl.exe'.format(grabpl_version), 'Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v{}/windows/grabpl.exe -OutFile grabpl.exe'.format(grabpl_version),
'.\\grabpl.exe verify-drone',
]) ])
steps = [ steps = [
{ {
@@ -1029,7 +1028,6 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
'rm -force grabpl.exe', 'rm -force grabpl.exe',
'C:\\App\\grabpl.exe init-enterprise C:\\App\\grafana-enterprise{}'.format(source_commit), 'C:\\App\\grabpl.exe init-enterprise C:\\App\\grafana-enterprise{}'.format(source_commit),
'cp C:\\App\\grabpl.exe grabpl.exe', 'cp C:\\App\\grabpl.exe grabpl.exe',
'.\\grabpl.exe verify-drone',
]) ])
return steps return steps
scripts/main.star
+1 -1
View File
@@ -49,9 +49,9 @@ def get_steps(edition, is_downstream=False):
test_backend_step(edition=edition), test_backend_step(edition=edition),
lint_backend_step(edition=edition), lint_backend_step(edition=edition),
test_frontend_step(), test_frontend_step(),
frontend_metrics_step(edition=edition),
build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
frontend_metrics_step(edition=edition),
build_plugins_step(edition=edition, sign=True), build_plugins_step(edition=edition, sign=True),
validate_scuemata(), validate_scuemata(),
] ]