mirror of https://github.com/grafana/grafana.git
				
				
				
			CI: Abstract Grafana versioning (#50935)
* Remove flags and update grabpl * Sign drone yaml
This commit is contained in:
		
							parent
							
								
									99de3313f7
								
							
						
					
					
						commit
						f279699beb
					
				
							
								
								
									
										118
									
								
								.drone.yml
								
								
								
								
							
							
						
						
									
										118
									
								
								.drone.yml
								
								
								
								
							|  | @ -15,7 +15,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -91,7 +91,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -197,7 +197,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -243,7 +243,6 @@ steps: | |||
|       from_secret: drone_token | ||||
| - commands: | ||||
|   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} | ||||
|     --variants linux-amd64,linux-amd64-musl,darwin-amd64,windows-amd64 | ||||
|   depends_on: | ||||
|   - gen-version | ||||
|   - wire-install | ||||
|  | @ -455,7 +454,7 @@ services: | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -542,7 +541,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -632,7 +631,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -721,7 +720,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -789,7 +788,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -884,7 +883,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -979,7 +978,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-frontend-packages | ||||
| - commands: | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition oss | ||||
|   depends_on: | ||||
|   - gen-version | ||||
|   - yarn-install | ||||
|  | @ -1230,7 +1229,7 @@ steps: | |||
|     repo: | ||||
|     - grafana/grafana | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads | ||||
|   - ./bin/grabpl upload-packages --edition oss | ||||
|   depends_on: | ||||
|   - end-to-end-tests-dashboards-suite | ||||
|   - end-to-end-tests-panels-suite | ||||
|  | @ -1247,7 +1246,7 @@ steps: | |||
|     repo: | ||||
|     - grafana/grafana | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets" | ||||
|   - ./bin/grabpl upload-cdn --edition oss | ||||
|   depends_on: | ||||
|   - grafana-server | ||||
|   environment: | ||||
|  | @ -1308,7 +1307,7 @@ services: | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -1398,7 +1397,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - $$ProgressPreference = "SilentlyContinue" | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe | ||||
|     -OutFile grabpl.exe | ||||
|   image: grafana/ci-wix:0.1.1 | ||||
|   name: windows-init | ||||
|  | @ -1486,7 +1485,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -1571,7 +1570,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -1628,7 +1627,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-frontend-packages | ||||
| - commands: | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition oss | ||||
|   depends_on: | ||||
|   - gen-version | ||||
|   - yarn-install | ||||
|  | @ -1778,8 +1777,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-storybook | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition oss --src-bucket "$${PRERELEASE_BUCKET}" --src-dir | ||||
|     artifacts/static-assets | ||||
|   - ./bin/grabpl upload-cdn --edition oss | ||||
|   depends_on: | ||||
|   - grafana-server | ||||
|   environment: | ||||
|  | @ -1790,7 +1788,7 @@ steps: | |||
|   image: grafana/grafana-ci-deploy:1.3.1 | ||||
|   name: upload-cdn-assets | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition oss --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads | ||||
|   - ./bin/grabpl upload-packages --edition oss | ||||
|   depends_on: | ||||
|   - end-to-end-tests-dashboards-suite | ||||
|   - end-to-end-tests-panels-suite | ||||
|  | @ -1869,7 +1867,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -2004,7 +2002,7 @@ services: | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -2098,7 +2096,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - $$ProgressPreference = "SilentlyContinue" | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe | ||||
|     -OutFile grabpl.exe | ||||
|   image: grafana/ci-wix:0.1.1 | ||||
|   name: windows-init | ||||
|  | @ -2157,7 +2155,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -2244,7 +2242,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-frontend-packages | ||||
| - commands: | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise | ||||
|   depends_on: | ||||
|   - gen-version | ||||
|   - yarn-install | ||||
|  | @ -2393,8 +2391,7 @@ steps: | |||
|     - success | ||||
|     - failure | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "$${PRERELEASE_BUCKET}" | ||||
|     --src-dir artifacts/static-assets | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise | ||||
|   depends_on: | ||||
|   - package | ||||
|   environment: | ||||
|  | @ -2405,7 +2402,7 @@ steps: | |||
|   image: grafana/grafana-ci-deploy:1.3.1 | ||||
|   name: upload-cdn-assets | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads | ||||
|   - ./bin/grabpl upload-packages --edition enterprise | ||||
|   depends_on: | ||||
|   - package | ||||
|   environment: | ||||
|  | @ -2446,8 +2443,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: package-enterprise2 | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "$${PRERELEASE_BUCKET}" | ||||
|     --src-dir artifacts/static-assets | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise2 | ||||
|   depends_on: | ||||
|   - package-enterprise2 | ||||
|   environment: | ||||
|  | @ -2458,7 +2454,7 @@ steps: | |||
|   image: grafana/grafana-ci-deploy:1.3.1 | ||||
|   name: upload-cdn-assets-enterprise2 | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2 | ||||
|   - ./bin/grabpl upload-packages --edition enterprise2 | ||||
|   depends_on: | ||||
|   - package-enterprise2 | ||||
|   environment: | ||||
|  | @ -2505,7 +2501,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -2688,7 +2684,7 @@ services: | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -2830,7 +2826,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - $$ProgressPreference = "SilentlyContinue" | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe | ||||
|     -OutFile grabpl.exe | ||||
|   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" | ||||
|   - cd grafana-enterprise | ||||
|  | @ -2905,7 +2901,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -2983,7 +2979,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3044,7 +3040,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3123,7 +3119,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3185,7 +3181,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3223,7 +3219,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3261,7 +3257,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3317,7 +3313,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3365,7 +3361,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3414,7 +3410,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3471,7 +3467,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-frontend-packages | ||||
| - commands: | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition oss | ||||
|   depends_on: | ||||
|   - gen-version | ||||
|   - yarn-install | ||||
|  | @ -3621,7 +3617,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-storybook | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets" | ||||
|   - ./bin/grabpl upload-cdn --edition oss | ||||
|   depends_on: | ||||
|   - grafana-server | ||||
|   environment: | ||||
|  | @ -3635,7 +3631,7 @@ steps: | |||
|     repo: | ||||
|     - grafana/grafana | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads | ||||
|   - ./bin/grabpl upload-packages --edition oss | ||||
|   depends_on: | ||||
|   - end-to-end-tests-dashboards-suite | ||||
|   - end-to-end-tests-panels-suite | ||||
|  | @ -3682,7 +3678,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3811,7 +3807,7 @@ services: | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -3899,7 +3895,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - $$ProgressPreference = "SilentlyContinue" | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe | ||||
|     -OutFile grabpl.exe | ||||
|   image: grafana/ci-wix:0.1.1 | ||||
|   name: windows-init | ||||
|  | @ -3947,7 +3943,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -4032,7 +4028,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-frontend-packages | ||||
| - commands: | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin | ||||
|   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise | ||||
|   depends_on: | ||||
|   - gen-version | ||||
|   - yarn-install | ||||
|  | @ -4193,7 +4189,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: build-storybook | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "grafana-static-assets" | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise | ||||
|   depends_on: | ||||
|   - package | ||||
|   environment: | ||||
|  | @ -4207,7 +4203,7 @@ steps: | |||
|     repo: | ||||
|     - grafana/grafana | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads | ||||
|   - ./bin/grabpl upload-packages --edition enterprise | ||||
|   depends_on: | ||||
|   - package | ||||
|   environment: | ||||
|  | @ -4241,7 +4237,7 @@ steps: | |||
|   image: grafana/build-container:1.5.7 | ||||
|   name: package-enterprise2 | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "grafana-static-assets" | ||||
|   - ./bin/grabpl upload-cdn --edition enterprise2 | ||||
|   depends_on: | ||||
|   - package-enterprise2 | ||||
|   environment: | ||||
|  | @ -4252,7 +4248,7 @@ steps: | |||
|   image: grafana/grafana-ci-deploy:1.3.1 | ||||
|   name: upload-cdn-assets-enterprise2 | ||||
| - commands: | ||||
|   - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2 | ||||
|   - ./bin/grabpl upload-packages --edition enterprise2 | ||||
|   depends_on: | ||||
|   - package-enterprise2 | ||||
|   environment: | ||||
|  | @ -4293,7 +4289,7 @@ services: [] | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -4467,7 +4463,7 @@ services: | |||
| steps: | ||||
| - commands: | ||||
|   - mkdir -p bin | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl | ||||
|   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl | ||||
|   - chmod +x bin/grabpl | ||||
|   image: byrnedo/alpine-curl:0.1.8 | ||||
|   name: grabpl | ||||
|  | @ -4600,7 +4596,7 @@ steps: | |||
|   name: identify-runner | ||||
| - commands: | ||||
|   - $$ProgressPreference = "SilentlyContinue" | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe | ||||
|   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe | ||||
|     -OutFile grabpl.exe | ||||
|   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" | ||||
|   - cd grafana-enterprise | ||||
|  | @ -4797,6 +4793,6 @@ kind: secret | |||
| name: gcp_upload_artifacts_key | ||||
| --- | ||||
| kind: signature | ||||
| hmac: 12fbd61337ed1ae006e8c0ff71d1290e27b5910211369cdd47e1d604afd9befa | ||||
| hmac: ec563f30c3aa398768ee9399bc2f6f50533da9b53c19d1c8b10a96277a42070c | ||||
| 
 | ||||
| ... | ||||
|  |  | |||
|  | @ -126,7 +126,7 @@ def get_steps(edition): | |||
|         build_backend_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_frontend_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_frontend_package_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_plugins_step(edition=edition, sign=True), | ||||
|         build_plugins_step(edition=edition, ver_mode=ver_mode), | ||||
|     ] | ||||
|     integration_test_steps = [ | ||||
|         postgres_integration_tests_step(edition=edition, ver_mode=ver_mode), | ||||
|  |  | |||
|  | @ -123,10 +123,10 @@ def pr_pipelines(edition): | |||
|     ] | ||||
|     build_steps = [ | ||||
|         enterprise_downstream_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants), | ||||
|         build_backend_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_frontend_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_frontend_package_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_plugins_step(edition=edition), | ||||
|         build_plugins_step(edition=edition, ver_mode=ver_mode), | ||||
|     ] | ||||
|     integration_test_steps = [ | ||||
|         postgres_integration_tests_step(edition=edition, ver_mode=ver_mode), | ||||
|  |  | |||
|  | @ -180,7 +180,7 @@ def get_steps(edition, ver_mode): | |||
|         build_backend_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_frontend_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_frontend_package_step(edition=edition, ver_mode=ver_mode), | ||||
|         build_plugins_step(edition=edition, sign=True), | ||||
|         build_plugins_step(edition=edition, ver_mode=ver_mode), | ||||
|     ] | ||||
| 
 | ||||
|     integration_test_steps = [ | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') | ||||
| 
 | ||||
| grabpl_version = 'v2.9.50' | ||||
| grabpl_version = 'v2.9.52' | ||||
| build_image = 'grafana/build-container:1.5.7' | ||||
| publish_image = 'grafana/grafana-ci-deploy:1.3.1' | ||||
| deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' | ||||
|  | @ -367,7 +367,7 @@ def upload_cdn_step(edition, ver_mode, trigger=None): | |||
|             'PRERELEASE_BUCKET': from_secret(prerelease_bucket) | ||||
|         }, | ||||
|         'commands': [ | ||||
|             './bin/grabpl upload-cdn --edition {} --src-bucket "{}"{}'.format(edition, bucket, src_dir), | ||||
|             './bin/grabpl upload-cdn --edition {}'.format(edition), | ||||
|         ], | ||||
|     } | ||||
|     if trigger and ver_mode in ("release-branch", "main"): | ||||
|  | @ -477,15 +477,13 @@ def build_frontend_docs_step(edition): | |||
|     } | ||||
| 
 | ||||
| 
 | ||||
| def build_plugins_step(edition, sign=False): | ||||
|     if sign: | ||||
| def build_plugins_step(edition, ver_mode): | ||||
|     if ver_mode!='pr': | ||||
|         env = { | ||||
|             'GRAFANA_API_KEY': from_secret('grafana_api_key'), | ||||
|         } | ||||
|         sign_args = ' --sign --signing-admin' | ||||
|     else: | ||||
|         env = None | ||||
|         sign_args = '' | ||||
|     return { | ||||
|         'name': 'build-plugins', | ||||
|         'image': build_image, | ||||
|  | @ -496,7 +494,7 @@ def build_plugins_step(edition, sign=False): | |||
|         ], | ||||
|         'commands': [ | ||||
|             # TODO: Use percentage for num jobs | ||||
|             './bin/grabpl build-plugins --jobs 8 --edition {}{}'.format(edition, sign_args), | ||||
|             './bin/grabpl build-plugins --jobs 8 --edition {}'.format(edition), | ||||
|         ], | ||||
|     } | ||||
| 
 | ||||
|  | @ -978,13 +976,12 @@ def upload_packages_step(edition, ver_mode, trigger=None): | |||
|         return None | ||||
| 
 | ||||
|     if ver_mode == 'release': | ||||
|         packages_bucket = '$${{PRERELEASE_BUCKET}}/artifacts/downloads{}'.format(enterprise2_suffix(edition)) | ||||
|         cmd = './bin/grabpl upload-packages --edition {} --packages-bucket {}'.format(edition, packages_bucket) | ||||
|         cmd = './bin/grabpl upload-packages --edition {}'.format(edition) | ||||
|     elif edition == 'enterprise2': | ||||
|         cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads-enterprise2'.format( | ||||
|         cmd = './bin/grabpl upload-packages --edition {}'.format( | ||||
|             edition) | ||||
|     else: | ||||
|         cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition) | ||||
|         cmd = './bin/grabpl upload-packages --edition {}'.format(edition) | ||||
| 
 | ||||
|     deps = [] | ||||
|     if edition in 'enterprise2' or not end_to_end_tests_deps(edition): | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue