Drone: Fixes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

.drone.yml

@@ -1072,7 +1072,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: alpine/git:v2.26.2
+  image: grafana/build-container:1.2.27
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl
@@ -1089,7 +1089,8 @@ steps:
   image: grafana/build-container:1.2.27
   commands:
   - export DRONE_TAG=$$(./bin/grabpl parse-tag-ref ${DRONE_COMMIT_REF})
-  - mv grabpl /tmp
+  - mv bin/grabpl /tmp/
+  - rmdir bin
   - mv grafana-enterprise /tmp/
   - /tmp/grabpl init-enterprise /tmp/grafana-enterprise $${DRONE_TAG}
   - mkdir bin
@@ -1835,7 +1836,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: alpine/git:v2.26.2
+  image: grafana/build-container:1.2.27
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl
@@ -1850,7 +1851,8 @@ steps:
 - name: initialize
   image: grafana/build-container:1.2.27
   commands:
-  - mv grabpl /tmp
+  - mv bin/grabpl /tmp/
+  - rmdir bin
   - mv grafana-enterprise /tmp/
   - /tmp/grabpl init-enterprise /tmp/grafana-enterprise
   - mkdir bin

lerna.json

@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
-  "version": "7.3.0-pre.0"
+  "version": "7.3.0-beta.1"
 }

package.json

@@ -3,7 +3,7 @@
   "license": "Apache-2.0",
   "private": true,
   "name": "grafana",
-  "version": "7.3.0-pre",
+  "version": "7.3.0-beta1",
   "repository": "github:grafana/grafana",
   "scripts": {
     "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
@@ -45,8 +45,8 @@
     "ci:test-frontend": "yarn run prettier:check && yarn run packages:typecheck && yarn run typecheck && yarn run test"
   },
   "grafana": {
-    "whatsNewUrl": "https://grafana.com/docs/grafana/latest/guides/whats-new-in-v7-2/",
+    "whatsNewUrl": "https://grafana.com/docs/grafana/latest/guides/whats-new-in-v7-3/",
-    "releaseNotesUrl": "https://community.grafana.com/t/release-notes-v7-2-x/36321"
+    "releaseNotesUrl": "https://community.grafana.com/t/release-notes-v7-3-x/37993"
   },
   "husky": {
     "hooks": {

packages/grafana-data/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"

packages/grafana-e2e-selectors/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",

packages/grafana-e2e/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -44,7 +44,7 @@
   "types": "src/index.ts",
   "dependencies": {
     "@cypress/webpack-preprocessor": "4.1.3",
-    "@grafana/e2e-selectors": "7.3.0-pre.0",
+    "@grafana/e2e-selectors": "7.3.0-beta.1",
     "@grafana/tsconfig": "^1.0.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "blink-diff": "1.0.13",

packages/grafana-runtime/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -22,8 +22,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@grafana/data": "7.3.0-pre.0",
+    "@grafana/data": "7.3.0-beta.1",
-    "@grafana/ui": "7.3.0-pre.0",
+    "@grafana/ui": "7.3.0-beta.1",
     "systemjs": "0.20.19",
     "systemjs-plugin-css": "0.1.37"
   },

packages/grafana-toolkit/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/toolkit",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",

packages/grafana-ui/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -27,15 +27,15 @@
   },
   "dependencies": {
     "@emotion/core": "^10.0.27",
-    "@grafana/data": "7.3.0-pre.0",
+    "@grafana/data": "7.3.0-beta.1",
-    "@grafana/e2e-selectors": "7.3.0-pre.0",
+    "@grafana/e2e-selectors": "7.3.0-beta.1",
     "@grafana/slate-react": "0.22.9-grafana",
     "@grafana/tsconfig": "^1.0.0-rc1",
     "@iconscout/react-unicons": "1.1.4",
     "@torkelo/react-select": "3.0.8",
+    "@types/hoist-non-react-statics": "3.3.1",
     "@types/react-beautiful-dnd": "12.1.2",
     "@types/react-color": "3.0.1",
-    "@types/hoist-non-react-statics": "3.3.1",
     "@types/react-select": "3.0.8",
     "@types/react-table": "7.0.12",
     "@types/slate": "0.47.1",
@@ -43,9 +43,8 @@
     "bizcharts": "^3.5.8",
     "classnames": "2.2.6",
     "d3": "5.15.0",
-    "hoist-non-react-statics": "3.3.2",
-    "immutable": "3.8.2",
     "emotion": "10.0.27",
+    "hoist-non-react-statics": "3.3.2",
     "immutable": "3.8.2",
     "jquery": "3.5.1",
     "lodash": "4.17.19",

packages/jaeger-ui-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaegertracing/jaeger-ui-components",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -14,8 +14,8 @@
     "typescript": "4.0.2"
   },
   "dependencies": {
-    "@grafana/data": "7.3.0-pre.0",
+    "@grafana/data": "7.3.0-beta.1",
-    "@grafana/ui": "7.3.0-pre.0",
+    "@grafana/ui": "7.3.0-beta.1",
     "@types/classnames": "^2.2.7",
     "@types/deep-freeze": "^0.1.1",
     "@types/hoist-non-react-statics": "^3.3.1",

plugins-bundled/internal/input-datasource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana-plugins/input-datasource",
-  "version": "7.3.0-pre.0",
+  "version": "7.3.0-beta.1",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -16,9 +16,9 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grafana/data": "7.3.0-pre.0",
+    "@grafana/data": "7.3.0-beta.1",
-    "@grafana/toolkit": "7.3.0-pre.0",
+    "@grafana/toolkit": "7.3.0-beta.1",
-    "@grafana/ui": "7.3.0-pre.0"
+    "@grafana/ui": "7.3.0-beta.1"
   },
   "volta": {
     "node": "12.16.2"

scripts/lib.star

@@ -4,7 +4,6 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
 alpine_image = 'alpine:3.12'
 windows_image = 'mcr.microsoft.com/windows:1809'
-git_image = 'alpine/git:v2.26.2'
 dockerize_version = '0.6.1'
 wix_image = 'grafana/ci-wix:0.1.1'
 test_release_ver = 'v7.3.0-test'
@@ -138,7 +137,7 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
             identify_runner_step,
             {
                 'name': 'clone',
-                'image': git_image,
+                'image': build_image,
                 'environment': {
                     'GITHUB_TOKEN': {
                         'from_secret': 'github_token',
@@ -160,7 +159,8 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
                     'clone',
                 ],
                 'commands': pre_cmds + [
-                    'mv grabpl /tmp',
+                    'mv bin/grabpl /tmp/',
+                    'rmdir bin',
                     'mv grafana-enterprise /tmp/',
                     '/tmp/grabpl init-enterprise /tmp/grafana-enterprise{}'.format(source_commit),
                     'mkdir bin',