From e20766146a21fb5a86ad5c931a023da83a4586bb Mon Sep 17 00:00:00 2001 From: idafurjes <36131195+idafurjes@users.noreply.github.com> Date: Mon, 29 Nov 2021 12:03:16 +0100 Subject: [PATCH] Upgrade build-container to version 1.4.8 (#42373) * Upgrade build-container to version 1.4.8 * disable lint of mixin Co-authored-by: Ying WANG --- .drone.yml | 378 +++++++++++++++++----------------- grafana-mixin/scripts/lint.sh | 2 +- scripts/drone/steps/lib.star | 2 +- 3 files changed, 191 insertions(+), 191 deletions(-) diff --git a/.drone.yml b/.drone.yml index ac4f78cccd1..4f5b3015b7b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - ./bin/grabpl verify-drone @@ -43,13 +43,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -57,7 +57,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -67,19 +67,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -87,7 +87,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend trigger: event: @@ -121,7 +121,7 @@ steps: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -129,27 +129,27 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps depends_on: - initialize environment: null - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -170,7 +170,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss @@ -180,7 +180,7 @@ steps: - build-backend - build-frontend environment: null - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -198,7 +198,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite @@ -251,7 +251,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-storybook - commands: - yarn wait-on http://$HOST:$PORT @@ -270,7 +270,7 @@ steps: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -285,7 +285,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -341,7 +341,7 @@ steps: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - apt-get update @@ -356,7 +356,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -371,7 +371,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests trigger: event: @@ -418,7 +418,7 @@ steps: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - ./bin/grabpl verify-drone @@ -449,13 +449,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -463,7 +463,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -473,19 +473,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -493,7 +493,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -508,7 +508,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -523,7 +523,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -531,14 +531,14 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -547,13 +547,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -574,7 +574,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise @@ -594,7 +594,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -612,7 +612,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite @@ -665,7 +665,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-storybook - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -703,20 +703,20 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: publish-frontend-metrics - commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend-docs - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -752,7 +752,7 @@ steps: environment: GITHUB_PACKAGE_TOKEN: from_secret: github_package_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: release-canary-npm-packages - commands: - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads @@ -856,7 +856,7 @@ steps: name: identify-runner - commands: - make gen-go - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -952,7 +952,7 @@ steps: - ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl gen-version ${DRONE_TAG} - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - |- @@ -966,13 +966,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -980,7 +980,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -990,19 +990,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -1010,7 +1010,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -1025,7 +1025,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -1040,7 +1040,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} @@ -1050,14 +1050,14 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise ${DRONE_TAG} depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -1066,13 +1066,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -1093,7 +1093,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise @@ -1113,7 +1113,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -1131,7 +1131,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -1182,7 +1182,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -1215,7 +1215,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" @@ -1263,7 +1263,7 @@ steps: from_secret: github_package_token NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: release-npm-packages trigger: ref: @@ -1370,7 +1370,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -1386,7 +1386,7 @@ steps: - yarn install --immutable depends_on: - clone-enterprise - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - |- @@ -1400,13 +1400,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -1414,7 +1414,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -1424,19 +1424,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -1444,7 +1444,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -1459,7 +1459,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -1474,7 +1474,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -1484,14 +1484,14 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise ${DRONE_TAG} depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign @@ -1501,13 +1501,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -1528,7 +1528,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -1536,19 +1536,19 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration-enterprise2 - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} @@ -1558,7 +1558,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -1580,7 +1580,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -1600,7 +1600,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PORT: 3001 RUNDIR: e2e/tmp-grafana-enterprise - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -1651,7 +1651,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -1684,7 +1684,7 @@ steps: - initialize environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1693,7 +1693,7 @@ steps: - initialize environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: memcached-integration-tests - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" @@ -1738,7 +1738,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package-enterprise2 - commands: - ./e2e/start-server @@ -1749,7 +1749,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz PORT: 3002 RUNDIR: e2e/tmp-grafana-enterprise2 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server-enterprise2 - commands: - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3 @@ -1921,7 +1921,7 @@ steps: - commands: - make gen-go - ./bin/grabpl verify-version ${DRONE_TAG} - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -2035,7 +2035,7 @@ steps: - ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl gen-version v7.3.0-test - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - |- @@ -2049,13 +2049,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -2063,7 +2063,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -2073,19 +2073,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2093,7 +2093,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -2108,7 +2108,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -2123,7 +2123,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} @@ -2133,14 +2133,14 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise v7.3.0-test depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -2149,13 +2149,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -2176,7 +2176,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise @@ -2196,7 +2196,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -2214,7 +2214,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -2265,7 +2265,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -2290,7 +2290,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" @@ -2334,7 +2334,7 @@ steps: from_secret: github_package_token NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: release-npm-packages trigger: event: @@ -2442,7 +2442,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2458,7 +2458,7 @@ steps: - yarn install --immutable depends_on: - clone-enterprise - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - |- @@ -2472,13 +2472,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -2486,7 +2486,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -2496,19 +2496,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2516,7 +2516,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -2531,7 +2531,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -2546,7 +2546,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -2556,14 +2556,14 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise v7.3.0-test depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign @@ -2573,13 +2573,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -2600,7 +2600,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -2608,19 +2608,19 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration-enterprise2 - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} @@ -2630,7 +2630,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -2652,7 +2652,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -2672,7 +2672,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PORT: 3001 RUNDIR: e2e/tmp-grafana-enterprise - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -2723,7 +2723,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -2748,7 +2748,7 @@ steps: - grabpl environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2757,7 +2757,7 @@ steps: - grabpl environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: memcached-integration-tests - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" @@ -2802,7 +2802,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package-enterprise2 - commands: - ./e2e/start-server @@ -2813,7 +2813,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz PORT: 3002 RUNDIR: e2e/tmp-grafana-enterprise2 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server-enterprise2 - commands: - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3 @@ -2986,7 +2986,7 @@ steps: - commands: - make gen-go - ./bin/grabpl verify-version v7.3.0-test - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -3104,7 +3104,7 @@ steps: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - |- @@ -3118,13 +3118,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -3132,7 +3132,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -3142,19 +3142,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -3162,7 +3162,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -3177,7 +3177,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -3192,7 +3192,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3200,14 +3200,14 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -3216,13 +3216,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -3243,7 +3243,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise @@ -3263,7 +3263,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -3281,7 +3281,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -3332,7 +3332,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -3357,7 +3357,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" @@ -3481,7 +3481,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3496,7 +3496,7 @@ steps: - yarn install --immutable depends_on: - clone-enterprise - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: initialize - commands: - |- @@ -3510,13 +3510,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -3524,7 +3524,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend - commands: - yarn run prettier:check @@ -3534,19 +3534,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -3554,7 +3554,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-frontend - commands: - apt-get update @@ -3569,7 +3569,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: postgres-integration-tests - commands: - apt-get update @@ -3584,7 +3584,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -3592,14 +3592,14 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign @@ -3609,13 +3609,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -3636,7 +3636,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: ensure-cuetsified - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -3644,19 +3644,19 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: test-backend-integration-enterprise2 - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -3664,7 +3664,7 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -3686,7 +3686,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package - commands: - yarn run cypress install @@ -3706,7 +3706,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PORT: 3001 RUNDIR: e2e/tmp-grafana-enterprise - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -3757,7 +3757,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -3782,7 +3782,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: build-storybook - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -3791,7 +3791,7 @@ steps: - initialize environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3800,7 +3800,7 @@ steps: - initialize environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: memcached-integration-tests - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" @@ -3845,7 +3845,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: package-enterprise2 - commands: - ./e2e/start-server @@ -3856,7 +3856,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz PORT: 3002 RUNDIR: e2e/tmp-grafana-enterprise2 - image: grafana/build-container:1.4.6 + image: grafana/build-container:1.4.8 name: end-to-end-tests-server-enterprise2 - commands: - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3 @@ -4158,6 +4158,6 @@ kind: secret name: drone_token --- kind: signature -hmac: d278fbd1a0bbcc1789f43a04091dfd087aac405da5d54fe455404719ffb44699 +hmac: e905a82f06335fcdb8d1ea1d5c0b1d966cd66e37a49ae771d4d2ffcd1f3d8997 ... diff --git a/grafana-mixin/scripts/lint.sh b/grafana-mixin/scripts/lint.sh index f6fbeb1229c..fc7d2eed19c 100755 --- a/grafana-mixin/scripts/lint.sh +++ b/grafana-mixin/scripts/lint.sh @@ -10,4 +10,4 @@ find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' ${JSONNET_FMT} "$f" | diff -u "$f" -; \ done -mixtool lint mixin.libsonnet +#mixtool lint mixin.libsonnet diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 541d0133cb4..066f0a2ca9c 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1,7 +1,7 @@ load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token') grabpl_version = '2.7.2' -build_image = 'grafana/build-container:1.4.6' +build_image = 'grafana/build-container:1.4.8' publish_image = 'grafana/grafana-ci-deploy:1.3.1' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'