From ff1afbb6994eb2c5fafca5ac9adcf5d9d319fa17 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Tue, 15 Nov 2022 13:47:14 +0000 Subject: [PATCH] Revert "Chore: move to node 18 (#58570)" (#58754) This reverts commit 0a9129cf90a7134411f8aeca1c0bd56b112e9371. --- .drone.yml | 384 +++++++++--------- .nvmrc | 2 +- Dockerfile | 2 +- Dockerfile.ubuntu | 2 +- contribute/developer-guide.md | 2 +- package.json | 2 +- .../SharePublicDashboard.test.tsx | 3 +- scripts/build/ci-build/Dockerfile | 4 +- scripts/build/ci-build/README.md | 2 - scripts/drone/steps/lib.star | 2 +- 10 files changed, 201 insertions(+), 204 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1be3ebcab5b..3a72db10b15 100644 --- a/.drone.yml +++ b/.drone.yml @@ -80,13 +80,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -94,7 +94,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-frontend trigger: event: @@ -135,7 +135,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn run prettier:check @@ -146,7 +146,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: lint-frontend trigger: event: @@ -200,7 +200,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -208,25 +208,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend-integration trigger: event: @@ -278,7 +278,7 @@ steps: - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update && apt-get install make @@ -348,7 +348,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -356,18 +356,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -392,7 +392,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: trigger-test-release when: paths: @@ -419,7 +419,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -428,7 +428,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -437,7 +437,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -445,7 +445,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -456,7 +456,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package - commands: - ./scripts/grafana-server/start-server @@ -469,7 +469,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: grafana-server - commands: - apt-get install -y netcat @@ -571,7 +571,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-storybook when: paths: @@ -582,7 +582,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -682,7 +682,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -690,13 +690,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update @@ -712,7 +712,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: postgres-integration-tests - commands: - apt-get update @@ -728,7 +728,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: mysql-integration-tests trigger: event: @@ -784,7 +784,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - |- @@ -796,7 +796,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.5 + image: grafana/build-container:1.6.4 name: codespell - commands: - yarn run prettier:checkDocs @@ -804,7 +804,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -852,7 +852,7 @@ steps: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: shellcheck trigger: event: @@ -897,7 +897,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - |- @@ -909,7 +909,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.5 + image: grafana/build-container:1.6.4 name: codespell - commands: - yarn run prettier:checkDocs @@ -917,7 +917,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -968,13 +968,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -982,7 +982,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-frontend trigger: branch: main @@ -1020,7 +1020,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn run prettier:check @@ -1031,7 +1031,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: lint-frontend trigger: branch: main @@ -1082,7 +1082,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1090,25 +1090,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend-integration trigger: branch: main @@ -1153,7 +1153,7 @@ steps: - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update && apt-get install make @@ -1223,7 +1223,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1231,25 +1231,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 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.5 + image: grafana/build-container:1.6.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1258,7 +1258,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1267,7 +1267,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1277,7 +1277,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1295,7 +1295,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package - commands: - ./scripts/grafana-server/start-server @@ -1308,7 +1308,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: grafana-server - commands: - apt-get install -y netcat @@ -1410,7 +1410,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-storybook when: paths: @@ -1421,7 +1421,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1465,7 +1465,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: publish-frontend-metrics when: repo: @@ -1546,7 +1546,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: release-canary-npm-packages when: repo: @@ -1655,7 +1655,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1663,13 +1663,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update @@ -1685,7 +1685,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: postgres-integration-tests - commands: - apt-get update @@ -1701,7 +1701,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: mysql-integration-tests trigger: branch: main @@ -1935,18 +1935,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -1960,7 +1960,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -1969,7 +1969,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -1978,7 +1978,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1988,7 +1988,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2006,14 +2006,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2052,7 +2052,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: grafana-server - commands: - apt-get install -y netcat @@ -2129,7 +2129,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-storybook when: event: @@ -2187,7 +2187,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: store-npm-packages trigger: event: @@ -2234,13 +2234,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2248,7 +2248,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-frontend trigger: event: @@ -2296,7 +2296,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2304,25 +2304,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend-integration trigger: event: @@ -2389,7 +2389,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2397,13 +2397,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update @@ -2419,7 +2419,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: postgres-integration-tests - commands: - apt-get update @@ -2435,7 +2435,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: mysql-integration-tests trigger: event: @@ -2552,7 +2552,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2568,7 +2568,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2582,13 +2582,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2598,7 +2598,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2607,14 +2607,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 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.5 + image: grafana/build-container:1.6.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2623,7 +2623,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2632,7 +2632,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2642,14 +2642,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 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.5 + image: grafana/build-container:1.6.4 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2668,14 +2668,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2715,7 +2715,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: grafana-server - commands: - apt-get install -y netcat @@ -2823,7 +2823,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 @@ -2845,7 +2845,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: store-npm-packages - commands: - ./bin/grabpl upload-packages --edition enterprise2 @@ -2897,7 +2897,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2913,7 +2913,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2929,14 +2929,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2945,7 +2945,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-frontend trigger: event: @@ -2982,7 +2982,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mkdir -p bin @@ -3004,7 +3004,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3026,7 +3026,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3035,25 +3035,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend-integration trigger: event: @@ -3126,7 +3126,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3142,7 +3142,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3152,7 +3152,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3161,13 +3161,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update @@ -3183,7 +3183,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: postgres-integration-tests - commands: - apt-get update @@ -3199,7 +3199,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -3208,7 +3208,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3217,7 +3217,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: memcached-integration-tests trigger: event: @@ -3658,7 +3658,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - ./bin/grabpl artifacts npm retrieve --tag v${TAG} @@ -3680,7 +3680,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: release-npm-packages trigger: event: @@ -3910,7 +3910,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: artifacts-page trigger: event: @@ -3955,18 +3955,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3980,7 +3980,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3989,7 +3989,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3998,7 +3998,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4008,7 +4008,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4026,14 +4026,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4072,7 +4072,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: grafana-server - commands: - apt-get install -y netcat @@ -4149,7 +4149,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-storybook when: paths: @@ -4228,13 +4228,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4242,7 +4242,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-frontend trigger: ref: @@ -4287,7 +4287,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4295,25 +4295,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend-integration trigger: ref: @@ -4377,7 +4377,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4385,13 +4385,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update @@ -4407,7 +4407,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: postgres-integration-tests - commands: - apt-get update @@ -4423,7 +4423,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: mysql-integration-tests trigger: ref: @@ -4530,7 +4530,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4545,7 +4545,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4559,13 +4559,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4575,7 +4575,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4584,14 +4584,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 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.5 + image: grafana/build-container:1.6.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4600,7 +4600,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4609,7 +4609,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -4619,7 +4619,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -4627,7 +4627,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4647,14 +4647,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -4694,7 +4694,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: grafana-server - commands: - apt-get install -y netcat @@ -4809,7 +4809,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 @@ -4869,7 +4869,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4884,7 +4884,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -4900,14 +4900,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4916,7 +4916,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-frontend trigger: ref: @@ -4950,7 +4950,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mkdir -p bin @@ -4971,7 +4971,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -4993,7 +4993,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5002,25 +5002,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: test-backend-integration trigger: ref: @@ -5090,7 +5090,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5105,7 +5105,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5115,7 +5115,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5124,13 +5124,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: wire-install - commands: - apt-get update @@ -5146,7 +5146,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: postgres-integration-tests - commands: - apt-get update @@ -5162,7 +5162,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5171,7 +5171,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5180,7 +5180,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.5 + image: grafana/build-container:1.6.4 name: memcached-integration-tests trigger: ref: @@ -5512,6 +5512,6 @@ kind: secret name: packages_secret_access_key --- kind: signature -hmac: 4f5e09af0ec5a9d59c5e31333bf180dd52cba1ad2780d96a62d20583113ccb16 +hmac: 2b1b5ade4e8007a9d5b76ec2dbc9e647ca0938e00713b3ad8e8163bce2db40a6 ... diff --git a/.nvmrc b/.nvmrc index 9dfef472196..bf79505bb85 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.12.0 +v16.14.0 diff --git a/Dockerfile b/Dockerfile index c79dadd34f5..1032ba60ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine3.15 as js-builder +FROM node:16-alpine3.15 as js-builder ENV NODE_OPTIONS=--max_old_space_size=8000 diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index a7835b5513a..077d97a0c99 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM node:18-alpine3.15 as js-builder +FROM node:16-alpine3.15 as js-builder ENV NODE_OPTIONS=--max_old_space_size=8000 diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md index fb20192b939..202d9e192b2 100644 --- a/contribute/developer-guide.md +++ b/contribute/developer-guide.md @@ -18,7 +18,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen ``` brew install git brew install go -brew install node@18 +brew install node@16 npm install -g yarn ``` diff --git a/package.json b/package.json index 1d124bc97a4..fb0faba2452 100644 --- a/package.json +++ b/package.json @@ -431,7 +431,7 @@ ] }, "engines": { - "node": ">= 18" + "node": ">= 16" }, "packageManager": "yarn@3.2.4" } diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx index f26c0a30e93..808826c68ba 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx @@ -71,7 +71,6 @@ beforeEach(() => { config.featureToggles.publicDashboards = true; mockDashboard = new DashboardModel({ uid: 'mockDashboardUid', - timezone: 'utc', }); mockPanel = new PanelModel({ @@ -146,7 +145,7 @@ describe('SharePublic', () => { await renderSharePublicDashboard({ panel: mockPanel, dashboard: mockDashboard, onDismiss: () => {} }); await screen.findByText('Welcome to Grafana public dashboards alpha!'); - expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 00:59:59')).toBeInTheDocument(); + expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 01:59:59')).toBeInTheDocument(); }); it('when modal is opened, then loader spinner appears and inputs are disabled', async () => { mockDashboard.meta.hasPublicDashboard = true; diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index c78c1a3249f..89b48b10d48 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -105,7 +105,7 @@ FROM debian:buster-20220822 ENV GOVERSION=1.19.3 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=18.12.0-1nodesource1 \ + NODEVERSION=16.14.0-1nodesource1 \ YARNVERSION=1.22.19-1 # Use ARG so as not to persist environment variable in image @@ -141,7 +141,7 @@ RUN apt-get update && \ gem install --conservative -N fpm && \ ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \ curl -fsS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - curl -O https://deb.nodesource.com/node_18.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\ + curl -O https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\ dpkg -i nodejs_${NODEVERSION}_amd64.deb &&\ rm nodejs_${NODEVERSION}_amd64.deb &&\ curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ diff --git a/scripts/build/ci-build/README.md b/scripts/build/ci-build/README.md index 685324a24a7..00d396d4b36 100644 --- a/scripts/build/ci-build/README.md +++ b/scripts/build/ci-build/README.md @@ -14,5 +14,3 @@ In order to build and publish the Grafana build Docker image, execute the follow docker build -t grafana/build-container: . docker push grafana/build-container: ``` - -If you're running on a machine that has an ARM chip (Apple M1/M2, etc.), add `--platform linux/amd64` to the `docker build` command. It can take approximately four hours for an initial build to complete. Due to caching, subsequent builds take less time. diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 0fc7f6f1487..14d09dd5fa7 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', 'prerelease_bucket') grabpl_version = 'v3.0.16' -build_image = 'grafana/build-container:1.6.5' +build_image = 'grafana/build-container:1.6.4' 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'