IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: Remove unused --github-token flag (#47773)

Browse Source 
* Remove github token flag

* Minor cleanup

* Update grabpl
This commit is contained in:
Dimitris Sotirakis
2022-04-15 10:42:58 +03:00
committed by GitHub
parent 24468fdd67
commit 508cc58a63
3 changed files with 54 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
.drone.yml
View File

@@ -15,7 +15,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -126,7 +126,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -152,7 +152,6 @@ steps:
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment: {}
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend name: build-backend
- commands: - commands:
@@ -378,7 +377,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -446,7 +445,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -534,7 +533,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -623,7 +622,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -732,7 +731,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -795,7 +794,6 @@ steps:
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment: {}
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend name: build-backend
- commands: - commands:
@@ -853,8 +851,6 @@ steps:
- build-frontend - build-frontend
- build-frontend-packages - build-frontend-packages
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -1167,7 +1163,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1239,7 +1235,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: windows-init name: windows-init
@@ -1326,7 +1322,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1410,7 +1406,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1431,19 +1427,14 @@ steps:
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: yarn-install name: yarn-install
- commands: - commands:
- ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} - ./bin/grabpl build-backend --jobs 8 --edition oss ${DRONE_TAG}
${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment:
GITHUB_TOKEN:
from_secret: github_token
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend name: build-backend
- commands: - commands:
- ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --edition - ./bin/grabpl build-frontend --jobs 8 --edition oss ${DRONE_TAG}
oss ${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- yarn-install - yarn-install
@@ -1452,8 +1443,7 @@ steps:
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-frontend name: build-frontend
- commands: - commands:
- ./bin/grabpl build-frontend-packages --jobs 8 --github-token $${GITHUB_TOKEN} - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG}
--edition oss ${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- yarn-install - yarn-install
@@ -1491,16 +1481,13 @@ steps:
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: ensure-cuetsified name: ensure-cuetsified
- commands: - commands:
- ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --sign - ./bin/grabpl package --jobs 8 --edition oss --sign ${DRONE_TAG}
${DRONE_TAG}
depends_on: depends_on:
- build-plugins - build-plugins
- build-backend - build-backend
- build-frontend - build-frontend
- build-frontend-packages - build-frontend-packages
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -1725,7 +1712,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1849,7 +1836,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1926,7 +1913,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: windows-init name: windows-init
@@ -1985,7 +1972,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2037,19 +2024,14 @@ steps:
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: gen-version name: gen-version
- commands: - commands:
- ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} - ./bin/grabpl build-backend --jobs 8 --edition enterprise ${DRONE_TAG}
${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment:
GITHUB_TOKEN:
from_secret: github_token
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend name: build-backend
- commands: - commands:
- ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --edition - ./bin/grabpl build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
enterprise ${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- yarn-install - yarn-install
@@ -2058,8 +2040,7 @@ steps:
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-frontend name: build-frontend
- commands: - commands:
- ./bin/grabpl build-frontend-packages --jobs 8 --github-token $${GITHUB_TOKEN} - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
--edition enterprise ${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- yarn-install - yarn-install
@@ -2097,19 +2078,14 @@ steps:
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: ensure-cuetsified name: ensure-cuetsified
- commands: - commands:
- ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
${DRONE_TAG}
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment:
GITHUB_TOKEN:
from_secret: github_token
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend-enterprise2 name: build-backend-enterprise2
- commands: - commands:
- ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} - ./bin/grabpl package --jobs 8 --edition enterprise --sign ${DRONE_TAG}
--sign ${DRONE_TAG}
depends_on: depends_on:
- build-plugins - build-plugins
- build-backend - build-backend
@@ -2117,8 +2093,6 @@ steps:
- build-frontend-packages - build-frontend-packages
- build-backend-enterprise2 - build-backend-enterprise2
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -2277,8 +2251,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.1 image: grafana/grafana-ci-deploy:1.3.1
name: store-npm-packages name: store-npm-packages
- commands: - commands:
- ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} - ./bin/grabpl package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG}
--sign ${DRONE_TAG}
depends_on: depends_on:
- build-plugins - build-plugins
- build-backend - build-backend
@@ -2286,8 +2259,6 @@ steps:
- build-frontend-packages - build-frontend-packages
- build-backend-enterprise2 - build-backend-enterprise2
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -2358,7 +2329,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2537,7 +2508,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2661,7 +2632,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/windows/grabpl.exe
-OutFile 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
@@ -2736,7 +2707,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2814,7 +2785,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2875,7 +2846,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2954,7 +2925,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3016,7 +2987,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3054,7 +3025,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3092,7 +3063,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3142,7 +3113,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3209,7 +3180,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3234,7 +3205,6 @@ steps:
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment: {}
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend name: build-backend
- commands: - commands:
@@ -3292,8 +3262,6 @@ steps:
- build-frontend - build-frontend
- build-frontend-packages - build-frontend-packages
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -3488,7 +3456,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3606,7 +3574,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3677,7 +3645,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: windows-init name: windows-init
@@ -3725,7 +3693,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3778,7 +3746,6 @@ steps:
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment: {}
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend name: build-backend
- commands: - commands:
@@ -3835,7 +3802,6 @@ steps:
depends_on: depends_on:
- gen-version - gen-version
- wire-install - wire-install
environment: {}
image: grafana/build-container:1.5.3 image: grafana/build-container:1.5.3
name: build-backend-enterprise2 name: build-backend-enterprise2
- commands: - commands:
@@ -3848,8 +3814,6 @@ steps:
- build-frontend-packages - build-frontend-packages
- build-backend-enterprise2 - build-backend-enterprise2
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -4021,8 +3985,6 @@ steps:
- build-frontend-packages - build-frontend-packages
- build-backend-enterprise2 - build-backend-enterprise2
environment: environment:
GITHUB_TOKEN:
from_secret: github_token
GPG_KEY_PASSWORD: GPG_KEY_PASSWORD:
from_secret: gpg_key_password from_secret: gpg_key_password
GPG_PRIV_KEY: GPG_PRIV_KEY:
@@ -4086,7 +4048,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -4256,7 +4218,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -4371,7 +4333,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.35/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.36/windows/grabpl.exe
-OutFile 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
@@ -4568,6 +4530,6 @@ kind: secret
name: gcp_upload_artifacts_key name: gcp_upload_artifacts_key
--- ---
kind: signature kind: signature
hmac: 6b2cdb67f637bdd527ba527741fd7d0af7e61b0700487be912821b93d8d16ca1 hmac: 203f82c4bb5060b26ecabb9a5d979ad3ae1eea3c586afddb083d685bbd4328f8
... ...

14
scripts/drone/pipelines/release.star
View File

@@ -224,7 +224,7 @@ def get_steps(edition, ver_mode):
build_steps.append(build_storybook) build_steps.append(build_storybook)
if include_enterprise2: 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: if should_upload:
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss)) 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" 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 # 'enterprise' edition services contain both OSS and enterprise services
services = integration_test_services(edition='enterprise')
if not trigger: if not trigger:
trigger = { trigger = {
'event': { '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. # 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 # 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. # 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 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 return pipelines
def get_e2e_suffix(): def get_e2e_suffix():

20
scripts/drone/steps/lib.star
View File

@@ -1,6 +1,6 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') 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' build_image = 'grafana/build-container:1.5.3'
publish_image = 'grafana/grafana-ci-deploy:1.3.1' publish_image = 'grafana/grafana-ci-deploy:1.3.1'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' 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 # TODO: Convert number of jobs to percentage
if ver_mode == 'release': if ver_mode == 'release':
env = {
'GITHUB_TOKEN': from_secret(github_token),
}
cmds = [ 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, edition,
), ),
] ]
else: else:
build_no = '${DRONE_BUILD_NUMBER}' build_no = '${DRONE_BUILD_NUMBER}'
env = {}
cmds = [ cmds = [
'./bin/grabpl build-backend --jobs 8 --edition {} --build-id {}{}'.format( './bin/grabpl build-backend --jobs 8 --edition {} --build-id {}{}'.format(
edition, build_no, variants_str, edition, build_no, variants_str,
@@ -388,7 +384,6 @@ def build_backend_step(edition, ver_mode, variants=None):
return { return {
'name': 'build-backend' + enterprise2_suffix(edition), 'name': 'build-backend' + enterprise2_suffix(edition),
'image': build_image, 'image': build_image,
'environment': env,
'depends_on': [ 'depends_on': [
'gen-version', 'gen-version',
'wire-install', 'wire-install',
@@ -403,7 +398,7 @@ def build_frontend_step(edition, ver_mode):
# TODO: Use percentage for num jobs # TODO: Use percentage for num jobs
if ver_mode == 'release': if ver_mode == 'release':
cmds = [ cmds = [
'./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} ' + \ './bin/grabpl build-frontend --jobs 8 ' + \
'--edition {} ${{DRONE_TAG}}'.format(edition), '--edition {} ${{DRONE_TAG}}'.format(edition),
] ]
else: else:
@@ -432,7 +427,7 @@ def build_frontend_package_step(edition, ver_mode):
# TODO: Use percentage for num jobs # TODO: Use percentage for num jobs
if ver_mode == 'release': if ver_mode == 'release':
cmds = [ cmds = [
'./bin/grabpl build-frontend-packages --jobs 8 --github-token $${GITHUB_TOKEN} ' + \ './bin/grabpl build-frontend-packages --jobs 8 ' + \
'--edition {} ${{DRONE_TAG}}'.format(edition), '--edition {} ${{DRONE_TAG}}'.format(edition),
] ]
else: else:
@@ -654,7 +649,6 @@ def package_step(edition, ver_mode, include_enterprise2=False, variants=None):
sign_args = ' --sign' sign_args = ' --sign'
env = { env = {
'GRAFANA_API_KEY': from_secret('grafana_api_key'), 'GRAFANA_API_KEY': from_secret('grafana_api_key'),
'GITHUB_TOKEN': from_secret(github_token),
'GPG_PRIV_KEY': from_secret('gpg_priv_key'), 'GPG_PRIV_KEY': from_secret('gpg_priv_key'),
'GPG_PUB_KEY': from_secret('gpg_pub_key'), 'GPG_PUB_KEY': from_secret('gpg_pub_key'),
'GPG_KEY_PASSWORD': from_secret('gpg_key_password'), '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': if ver_mode == 'release':
cmds = [ cmds = [
'{}./bin/grabpl package --jobs 8 --edition {} '.format(test_args, edition) + \ '{}./bin/grabpl package --jobs 8 --edition {} '.format(test_args, edition) + \
'--github-token $${{GITHUB_TOKEN}}{} ${{DRONE_TAG}}'.format( '{} ${{DRONE_TAG}}'.format(
sign_args 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 = []
deps.extend(['grabpl']) deps.extend(['grabpl'])
return { 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 = []
deps.extend(['grabpl']) deps.extend(['grabpl'])
return { return {