Backport image_pull_secrets

DRONE_TARGET_BRANCH -> GRAFANA_BRANCH
update .drone.yml with new grabpl version
2023-04-26 11:11:09 +03:00 · 2023-04-25 09:09:37 -05:00 · 2023-04-25 08:58:52 -05:00 · 2023-04-25 08:32:21 -05:00 · 2023-04-24 22:21:38 -05:00 · 2023-04-24 22:19:28 -05:00
16 changed files with 288 additions and 310 deletions
--- a/.drone.yml
+++ b/.drone.yml
--- a/2
+++ b/2
@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.19.9-alpine3.17 as go-builder
+FROM golang:1.19.8-alpine3.17 as go-builder

 RUN apk add --no-cache gcc g++ make

--- a/lerna.json
+++ b/lerna.json
@@ -4,5 +4,5 @@
  "packages": [
    "packages/*"
  ],
-  "version": "8.5.25"
+  "version": "8.5.24"
 }
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "grafana",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "repository": "github:grafana/grafana",
  "scripts": {
    "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/data",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
@@ -22,7 +22,7 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "6.0.0",
-    "@grafana/schema": "8.5.25",
+    "@grafana/schema": "8.5.24",
    "@types/d3-interpolate": "^1.4.0",
    "d3-interpolate": "1.4.0",
    "date-fns": "2.28.0",
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e-selectors",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana End-to-End Test Selectors Library",
  "keywords": [
    "cli",
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana End-to-End Test Library",
  "keywords": [
    "cli",
@@ -48,7 +48,7 @@
    "@babel/core": "7.17.8",
    "@babel/preset-env": "7.16.11",
    "@cypress/webpack-preprocessor": "5.11.1",
-    "@grafana/e2e-selectors": "8.5.25",
+    "@grafana/e2e-selectors": "8.5.24",
    "@grafana/tsconfig": "^1.2.0-rc1",
    "@mochajs/json-file-reporter": "^1.2.0",
    "babel-loader": "8.2.4",
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/runtime",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana Runtime Library",
  "keywords": [
    "grafana",
@@ -22,9 +22,9 @@
    "typecheck": "tsc --noEmit"
  },
  "dependencies": {
-    "@grafana/data": "8.5.25",
-    "@grafana/e2e-selectors": "8.5.25",
-    "@grafana/ui": "8.5.25",
+    "@grafana/data": "8.5.24",
+    "@grafana/e2e-selectors": "8.5.24",
+    "@grafana/ui": "8.5.24",
    "@sentry/browser": "6.19.1",
    "history": "4.10.1",
    "lodash": "4.17.21",
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/schema",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana Schema Library",
  "keywords": [
    "typescript"
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/toolkit",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana Toolkit",
  "keywords": [
    "grafana",
@@ -28,10 +28,10 @@
  "dependencies": {
    "@babel/core": "7.13.14",
    "@babel/preset-env": "7.13.12",
-    "@grafana/data": "8.5.25",
+    "@grafana/data": "8.5.24",
    "@grafana/eslint-config": "2.5.2",
    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@grafana/ui": "8.5.25",
+    "@grafana/ui": "8.5.24",
    "@jest/core": "26.6.3",
    "@rushstack/eslint-patch": "1.0.6",
    "@types/command-exists": "^1.2.0",
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/ui",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Grafana Components Library",
  "keywords": [
    "grafana",
@@ -33,9 +33,9 @@
    "@emotion/css": "11.7.1",
    "@emotion/react": "11.8.2",
    "@grafana/aws-sdk": "0.0.35",
-    "@grafana/data": "8.5.25",
-    "@grafana/e2e-selectors": "8.5.25",
-    "@grafana/schema": "8.5.25",
+    "@grafana/data": "8.5.24",
+    "@grafana/e2e-selectors": "8.5.24",
+    "@grafana/schema": "8.5.24",
    "@monaco-editor/react": "4.3.1",
    "@popperjs/core": "2.11.4",
    "@react-aria/button": "3.4.3",
--- a/packages/jaeger-ui-components/package.json
+++ b/packages/jaeger-ui-components/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@jaegertracing/jaeger-ui-components",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -26,8 +26,8 @@
  },
  "dependencies": {
    "@emotion/css": "11.7.1",
-    "@grafana/data": "8.5.25",
-    "@grafana/ui": "8.5.25",
+    "@grafana/data": "8.5.24",
+    "@grafana/ui": "8.5.24",
    "chance": "^1.0.10",
    "classnames": "^2.2.5",
    "combokeys": "^3.0.0",
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@grafana-plugins/input-datasource",
-  "version": "8.5.25",
+  "version": "8.5.24",
  "description": "Input Datasource",
  "private": true,
  "repository": {
@@ -24,9 +24,9 @@
    "webpack": "5.58.1"
  },
  "dependencies": {
-    "@grafana/data": "8.5.25",
-    "@grafana/toolkit": "8.5.25",
-    "@grafana/ui": "8.5.25",
+    "@grafana/data": "8.5.24",
+    "@grafana/toolkit": "8.5.24",
+    "@grafana/ui": "8.5.24",
    "jquery": "3.5.1",
    "react": "17.0.1",
    "react-dom": "17.0.1",
--- a/scripts/build/ci-build/Dockerfile
+++ b/scripts/build/ci-build/Dockerfile
@@ -1,5 +1,5 @@
-# Use old Debian (this has support into 2024) in order to ensure binary compatibility with older glibc's.
-FROM debian:buster-20230502 AS toolchain
+# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
+FROM debian:stretch-20210208 AS toolchain

 ENV OSX_MIN=10.10 \
    CTNG=1.24.0 \
@@ -107,10 +107,10 @@ RUN tar -xzvf dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz -C /tmp/
 RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz

 # Base image to crossbuild grafana.
-# Use old Debian (this has support into 2024) in order to ensure binary compatibility with older glibc's.
-FROM debian:buster-20230502
+# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
+FROM debian:stretch-20210208

-ENV GOVERSION=1.19.9 \
+ENV GOVERSION=1.19.8 \
    PATH=/usr/local/go/bin:$PATH \
    GOPATH=/go \
    NODEVERSION=16.14.0-1nodesource1 \
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1,14 +1,14 @@
 load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')

-grabpl_version = 'v2.9.50-fixfpm-3'
-build_image = 'grafana/build-container:1.5.5-go1.19.9'
+grabpl_version = 'v2.9.50-fixfpm'
+build_image = 'grafana/build-container:1.5.5-go1.19.8'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
 alpine_image = 'alpine:3.15'
 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.9"
+go_image = "golang:1.19.8"

 disable_tests = False
 trigger_oss = {
@@ -118,18 +118,13 @@ def init_enterprise_step(ver_mode):
        source_commit = ' ${DRONE_TAG}'
        environment = {
            'GITHUB_TOKEN': from_secret(github_token),
-            'GRAFANA_BRANCH': 'v8.5.x',
        }
        token = "--github-token $${GITHUB_TOKEN}"
    elif ver_mode == 'release-branch':
-        environment = {
-            'GRAFANA_BRANCH': 'v8.5.x',
-        }
+        environment = {}
        token = ""
    else:
-        environment = {
-            'GRAFANA_BRANCH': 'v8.5.x',
-        }
+        environment = {}
        token = ""
    commands = [
        'mv bin/grabpl /tmp/',
@@ -1138,8 +1133,7 @@ def get_windows_steps(edition, ver_mode):
            'environment': {
                'GCP_KEY': from_secret('gcp_key'),
                'PRERELEASE_BUCKET': from_secret(prerelease_bucket),
-                'GITHUB_TOKEN': from_secret('github_token'),
-                'GRAFANA_BRANCH': 'v8.5.x',
+                'GITHUB_TOKEN': from_secret('github_token')
            },
            'commands': installer_commands,
        })
--- a/yarn.lock
+++ b/yarn.lock
@@ -3949,9 +3949,9 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
  dependencies:
-    "@grafana/data": 8.5.25
-    "@grafana/toolkit": 8.5.25
-    "@grafana/ui": 8.5.25
+    "@grafana/data": 8.5.24
+    "@grafana/toolkit": 8.5.24
+    "@grafana/ui": 8.5.24
    "@types/jest": 26.0.15
    "@types/lodash": 4.14.149
    "@types/react": 17.0.30
@@ -3992,12 +3992,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/data@8.5.25, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@8.5.24, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
  version: 0.0.0-use.local
  resolution: "@grafana/data@workspace:packages/grafana-data"
  dependencies:
    "@braintree/sanitize-url": 6.0.0
-    "@grafana/schema": 8.5.25
+    "@grafana/schema": 8.5.24
    "@grafana/tsconfig": ^1.2.0-rc1
    "@rollup/plugin-commonjs": 21.0.2
    "@rollup/plugin-json": 4.1.0
@@ -4050,7 +4050,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/e2e-selectors@8.5.25, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@8.5.24, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
  version: 0.0.0-use.local
  resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
  dependencies:
@@ -4074,7 +4074,7 @@ __metadata:
    "@babel/core": 7.17.8
    "@babel/preset-env": 7.16.11
    "@cypress/webpack-preprocessor": 5.11.1
-    "@grafana/e2e-selectors": 8.5.25
+    "@grafana/e2e-selectors": 8.5.24
    "@grafana/tsconfig": ^1.2.0-rc1
    "@mochajs/json-file-reporter": ^1.2.0
    "@rollup/plugin-commonjs": 21.0.2
@@ -4181,10 +4181,10 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
  dependencies:
-    "@grafana/data": 8.5.25
-    "@grafana/e2e-selectors": 8.5.25
+    "@grafana/data": 8.5.24
+    "@grafana/e2e-selectors": 8.5.24
    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 8.5.25
+    "@grafana/ui": 8.5.24
    "@rollup/plugin-commonjs": 21.0.2
    "@rollup/plugin-node-resolve": 13.1.3
    "@sentry/browser": 6.19.1
@@ -4213,7 +4213,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/schema@8.5.25, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@8.5.24, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
  version: 0.0.0-use.local
  resolution: "@grafana/schema@workspace:packages/grafana-schema"
  dependencies:
@@ -4231,16 +4231,16 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/toolkit@8.5.25, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
+"@grafana/toolkit@8.5.24, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
  version: 0.0.0-use.local
  resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
  dependencies:
    "@babel/core": 7.13.14
    "@babel/preset-env": 7.13.12
-    "@grafana/data": 8.5.25
+    "@grafana/data": 8.5.24
    "@grafana/eslint-config": 2.5.2
    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 8.5.25
+    "@grafana/ui": 8.5.24
    "@jest/core": 26.6.3
    "@rushstack/eslint-patch": 1.0.6
    "@types/command-exists": ^1.2.0
@@ -4324,7 +4324,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/ui@8.5.25, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@8.5.24, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
  version: 0.0.0-use.local
  resolution: "@grafana/ui@workspace:packages/grafana-ui"
  dependencies:
@@ -4332,9 +4332,9 @@ __metadata:
    "@emotion/css": 11.7.1
    "@emotion/react": 11.8.2
    "@grafana/aws-sdk": 0.0.35
-    "@grafana/data": 8.5.25
-    "@grafana/e2e-selectors": 8.5.25
-    "@grafana/schema": 8.5.25
+    "@grafana/data": 8.5.24
+    "@grafana/e2e-selectors": 8.5.24
+    "@grafana/schema": 8.5.24
    "@grafana/tsconfig": ^1.2.0-rc1
    "@mdx-js/react": 1.6.22
    "@monaco-editor/react": 4.3.1
@@ -4570,9 +4570,9 @@ __metadata:
  resolution: "@jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components"
  dependencies:
    "@emotion/css": 11.7.1
-    "@grafana/data": 8.5.25
+    "@grafana/data": 8.5.24
    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 8.5.25
+    "@grafana/ui": 8.5.24
    "@types/classnames": ^2.2.7
    "@types/deep-freeze": ^0.1.1
    "@types/hoist-non-react-statics": ^3.3.1
Author	SHA1	Message	Date
Julien Duchesne	87c030215b	Backport image_pull_secrets	2023-04-26 11:11:09 +03:00
Kevin Minehart	7843bdca83	DRONE_TARGET_BRANCH -> GRAFANA_BRANCH	2023-04-25 09:09:37 -05:00
Kevin Minehart	4d4e17ea97	update .drone.yml with new grabpl version	2023-04-25 08:58:52 -05:00
Kevin Minehart	d29920a244	trying fix with new grabpl version	2023-04-25 08:32:21 -05:00
Kevin Minehart	9425c20b56	don't wait for other pipelines	2023-04-24 22:21:38 -05:00
Kevin Minehart	b0b59fa4c9	i don't know	2023-04-24 22:19:28 -05:00
Kevin Minehart	2245914066	apparently it checks that it matches a stream branch name... TIL?	2023-04-24 21:52:38 -05:00
Kevin Minehart	0893bd8736	:shrug;	2023-04-24 21:22:52 -05:00
Kevin Minehart	8ba0888470	i picked the wrong block again	2023-04-24 18:08:34 -05:00
Kevin Minehart	4c74cf88be	fix it for real this time oops	2023-04-24 15:15:28 -05:00
Kevin Minehart	adf0e0a8e4	update drone yaml to set DRONE TARGET BRANCH on the windows init function	2023-04-24 13:52:34 -05:00
Kevin Minehart	3210cb0e70	remove release integration tests	2023-04-24 13:32:43 -05:00
Grot (@grafanabot)	2e37789aa5	Release: Bump version to 8.5.24 (#854 ) "Release: Updated versions in package to 8.5.24"	2023-04-24 13:26:49 -05:00
Horst Gutmann	ab2e1c5d68	[v8.5.x] Chore: Update SAML lib (#840 ) * Update SAML lib * Replace golang.org/x/net with v0.7.0 * Revert "Replace golang.org/x/net with v0.7.0" This reverts commit 5fb83d7cc4bf1023db407268e6dd2feff640118d. * skip broken test --------- Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>	2023-04-24 13:19:44 -05:00