diff --git a/.drone.yml b/.drone.yml index b76266b6d78..bf393be0dab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -84,13 +84,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -98,7 +98,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: event: @@ -141,7 +141,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn run prettier:check @@ -152,7 +152,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-frontend trigger: event: @@ -197,7 +197,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -206,7 +206,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -214,25 +214,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -281,12 +281,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update && apt-get install make @@ -295,7 +295,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.19.3 + image: golang:1.19.4 name: lint-backend trigger: event: @@ -350,7 +350,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -359,7 +359,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -367,18 +367,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -403,7 +403,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: trigger-test-release when: paths: @@ -430,7 +430,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -439,7 +439,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -448,7 +448,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -456,7 +456,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -467,7 +467,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ./scripts/grafana-server/start-server @@ -480,7 +480,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -583,7 +583,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: paths: @@ -594,7 +594,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -683,7 +683,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -696,7 +696,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -704,13 +704,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -726,7 +726,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -742,7 +742,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: event: @@ -800,7 +800,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - |- @@ -812,7 +812,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: codespell - commands: - yarn run prettier:checkDocs @@ -820,7 +820,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -864,13 +864,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: shellcheck trigger: event: @@ -917,7 +917,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - |- @@ -929,7 +929,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: codespell - commands: - yarn run prettier:checkDocs @@ -937,7 +937,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -990,13 +990,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1004,7 +1004,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: branch: main @@ -1044,7 +1044,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn run prettier:check @@ -1055,7 +1055,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-frontend trigger: branch: main @@ -1097,7 +1097,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1106,7 +1106,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1114,25 +1114,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: branch: main @@ -1174,12 +1174,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update && apt-get install make @@ -1188,7 +1188,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.19.3 + image: golang:1.19.4 name: lint-backend - commands: - ./bin/build verify-drone @@ -1242,7 +1242,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1251,7 +1251,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1259,25 +1259,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1286,7 +1286,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1295,7 +1295,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1305,7 +1305,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1323,7 +1323,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ./scripts/grafana-server/start-server @@ -1336,7 +1336,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -1439,7 +1439,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: paths: @@ -1450,7 +1450,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1494,7 +1494,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: publish-frontend-metrics when: repo: @@ -1575,7 +1575,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: release-canary-npm-packages when: repo: @@ -1673,7 +1673,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1686,7 +1686,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1694,13 +1694,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -1716,7 +1716,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -1732,7 +1732,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: branch: main @@ -1970,32 +1970,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2004,7 +2004,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2013,7 +2013,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2023,7 +2023,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2041,14 +2041,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2087,7 +2087,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -2164,7 +2164,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: event: @@ -2222,7 +2222,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: store-npm-packages trigger: event: @@ -2271,13 +2271,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2285,7 +2285,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: event: @@ -2324,7 +2324,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2333,7 +2333,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2341,25 +2341,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -2426,7 +2426,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2434,13 +2434,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -2456,7 +2456,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -2472,7 +2472,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: event: @@ -2589,7 +2589,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2605,7 +2605,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2613,19 +2613,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2635,7 +2635,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2644,14 +2644,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2660,7 +2660,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2669,7 +2669,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2679,7 +2679,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2697,14 +2697,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2744,7 +2744,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -2876,7 +2876,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2892,7 +2892,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2908,14 +2908,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2924,7 +2924,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: event: @@ -2961,7 +2961,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mkdir -p bin @@ -2983,7 +2983,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2995,7 +2995,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3005,7 +3005,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3014,25 +3014,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -3105,7 +3105,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3121,7 +3121,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3131,7 +3131,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3140,13 +3140,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -3162,7 +3162,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -3178,7 +3178,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -3187,7 +3187,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3196,7 +3196,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: memcached-integration-tests trigger: event: @@ -3333,7 +3333,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3349,7 +3349,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3357,19 +3357,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3379,7 +3379,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3388,7 +3388,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3397,7 +3397,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3407,14 +3407,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3432,7 +3432,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3452,7 +3452,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3583,7 +3583,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3599,7 +3599,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3607,19 +3607,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3629,7 +3629,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3638,7 +3638,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3647,7 +3647,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3657,14 +3657,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3682,7 +3682,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3702,7 +3702,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3828,7 +3828,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3924,7 +3924,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -4003,7 +4003,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -4072,7 +4072,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4135,7 +4135,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4199,7 +4199,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -4360,7 +4360,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - ./bin/grabpl artifacts npm retrieve --tag ${DRONE_TAG} @@ -4382,7 +4382,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: release-npm-packages trigger: event: @@ -4425,7 +4425,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - depends_on: - grabpl @@ -4522,7 +4522,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - depends_on: - grabpl @@ -4618,7 +4618,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: artifacts-page trigger: event: @@ -4663,32 +4663,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4697,7 +4697,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4706,7 +4706,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4716,7 +4716,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4734,14 +4734,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4780,7 +4780,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -4857,7 +4857,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: paths: @@ -4938,13 +4938,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4952,7 +4952,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: ref: @@ -4988,7 +4988,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4997,7 +4997,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5005,25 +5005,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: ref: @@ -5087,7 +5087,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5095,13 +5095,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -5117,7 +5117,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -5133,7 +5133,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: ref: @@ -5240,7 +5240,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5255,7 +5255,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5263,19 +5263,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5285,7 +5285,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5294,14 +5294,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5310,7 +5310,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5319,7 +5319,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5329,7 +5329,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5348,14 +5348,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5395,7 +5395,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -5530,7 +5530,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5545,7 +5545,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5561,14 +5561,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5577,7 +5577,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: ref: @@ -5611,7 +5611,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mkdir -p bin @@ -5632,7 +5632,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5644,7 +5644,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5654,7 +5654,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5663,25 +5663,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: ref: @@ -5751,7 +5751,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5766,7 +5766,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5776,7 +5776,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5785,13 +5785,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -5807,7 +5807,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -5823,7 +5823,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5832,7 +5832,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5841,7 +5841,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: memcached-integration-tests trigger: ref: @@ -5968,7 +5968,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5983,7 +5983,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5991,19 +5991,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6013,7 +6013,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6022,7 +6022,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6031,7 +6031,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -6041,7 +6041,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6049,7 +6049,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6068,7 +6068,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -6088,7 +6088,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6318,7 +6318,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -6439,6 +6439,6 @@ kind: secret name: aws_secret_access_key --- kind: signature -hmac: a1be45b783375352bc7cf74eef3646d4545f1545407972f0e888eef2d13a1d49 +hmac: 64942ed50326b912df092e639ce480eb1a0438947c7f3df4fbf126655e5e9c3e ... diff --git a/Dockerfile b/Dockerfile index 11bb3cebab8..535eee08c00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:3.15 ARG JS_IMAGE=node:16-alpine3.15 -ARG GO_IMAGE=golang:1.19.3-alpine3.15 +ARG GO_IMAGE=golang:1.19.4-alpine3.15 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index 8604c8df651..3017f9a947d 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. DOCKER_BUILDKIT=1 \ docker build \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg GO_IMAGE=golang:1.19.3 \ + --build-arg GO_IMAGE=golang:1.19.4 \ --tag grafana/grafana:dev-ubuntu . ##@ Services diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 89b48b10d48..a0c1e6f792c 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -102,7 +102,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's. FROM debian:buster-20220822 -ENV GOVERSION=1.19.3 \ +ENV GOVERSION=1.19.4 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=16.14.0-1nodesource1 \ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index e58d8cbdbb0..14ac4744260 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -6,14 +6,14 @@ load( ) grabpl_version = 'v3.0.20' -build_image = 'grafana/build-container:1.6.4' +build_image = 'grafana/build-container:1.6.6' publish_image = 'grafana/grafana-ci-deploy:1.3.3' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' alpine_image = 'alpine:3.15.6' curl_image = 'byrnedo/alpine-curl:0.1.8' windows_image = 'mcr.microsoft.com/windows:1809' wix_image = 'grafana/ci-wix:0.1.1' -go_image = 'golang:1.19.3' +go_image = 'golang:1.19.4' trigger_oss = { 'repo': [