From bb738e35cf0b14e88c608441f6eb3bdc9f5fe91b Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Thu, 21 Oct 2021 09:59:12 +0300 Subject: [PATCH] Chore: Move Grafana version generator in initialize step (#40604) * Move gen-version * Small dependencies reorder * Update grabpl version --- .drone.yml | 188 ++++++++++----------------- scripts/drone/pipelines/main.star | 7 +- scripts/drone/pipelines/pr.star | 7 +- scripts/drone/pipelines/release.star | 7 +- scripts/drone/steps/lib.star | 47 ++----- 5 files changed, 92 insertions(+), 164 deletions(-) diff --git a/.drone.yml b/.drone.yml index fb6733b7760..d026d45679c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,10 +28,11 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go + - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable image: grafana/build-container:1.4.3 name: initialize @@ -145,20 +146,12 @@ steps: image: grafana/build-container:1.4.3 name: ensure-cuetsified - commands: - - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} + - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss + --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64,linux-x64-musl,osx64,win64,armv6 depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss - --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64,linux-x64-musl,osx64,win64,armv6 - depends_on: - - gen-version environment: null image: grafana/build-container:1.4.3 name: package @@ -184,7 +177,7 @@ steps: - yarn storybook:build - ./bin/grabpl verify-storybook depends_on: - - package + - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 image: grafana/build-container:1.4.3 @@ -220,7 +213,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -298,10 +291,11 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go + - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable image: grafana/build-container:1.4.3 name: initialize @@ -428,20 +422,12 @@ steps: image: grafana/build-container:1.4.3 name: ensure-cuetsified - commands: - - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} + - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise + --sign depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise - --sign - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -477,7 +463,7 @@ steps: - yarn storybook:build - ./bin/grabpl verify-storybook depends_on: - - package + - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 image: grafana/build-container:1.4.3 @@ -527,7 +513,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -637,7 +623,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -684,7 +670,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go @@ -772,11 +758,12 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go - ./bin/grabpl verify-version ${DRONE_TAG} + - ./bin/grabpl gen-version ${DRONE_TAG} - yarn install --immutable image: grafana/build-container:1.4.3 name: initialize @@ -894,20 +881,12 @@ steps: image: grafana/build-container:1.4.3 name: ensure-cuetsified - commands: - - ./bin/grabpl gen-version ${DRONE_TAG} + - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise + --sign ${DRONE_TAG} depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise - --sign ${DRONE_TAG} - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -943,7 +922,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -1006,7 +985,7 @@ steps: - yarn storybook:build - ./bin/grabpl verify-storybook depends_on: - - package + - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 image: grafana/build-container:1.4.3 @@ -1076,7 +1055,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -1143,7 +1122,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -1164,6 +1143,7 @@ steps: - ./bin/grabpl verify-drone - make gen-go - ./bin/grabpl verify-version ${DRONE_TAG} + - ./bin/grabpl gen-version ${DRONE_TAG} - yarn install --immutable depends_on: - clone @@ -1315,22 +1295,14 @@ steps: image: grafana/build-container:1.4.3 name: build-backend-enterprise2 - commands: - - ./bin/grabpl gen-version ${DRONE_TAG} + - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} + --no-pull-enterprise --sign ${DRONE_TAG} depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - build-backend-enterprise2 - test-backend-enterprise2 - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} - --no-pull-enterprise --sign ${DRONE_TAG} - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -1368,7 +1340,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -1473,7 +1445,11 @@ steps: - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} depends_on: - - gen-version + - build-plugins + - build-backend + - build-frontend + - build-backend-enterprise2 + - test-backend-enterprise2 environment: GITHUB_TOKEN: from_secret: github_token @@ -1554,7 +1530,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -1619,7 +1595,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go @@ -1726,11 +1702,12 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go - ./bin/grabpl verify-version v7.3.0-test + - ./bin/grabpl gen-version v7.3.0-test - yarn install --immutable image: grafana/build-container:1.4.3 name: initialize @@ -1848,20 +1825,12 @@ steps: image: grafana/build-container:1.4.3 name: ensure-cuetsified - commands: - - ./bin/grabpl gen-version v7.3.0-test + - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise + --sign v7.3.0-test depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise - --sign v7.3.0-test - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -1897,7 +1866,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -1952,7 +1921,7 @@ steps: - yarn storybook:build - ./bin/grabpl verify-storybook depends_on: - - package + - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 image: grafana/build-container:1.4.3 @@ -2018,7 +1987,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -2086,7 +2055,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -2107,6 +2076,7 @@ steps: - ./bin/grabpl verify-drone - make gen-go - ./bin/grabpl verify-version v7.3.0-test + - ./bin/grabpl gen-version v7.3.0-test - yarn install --immutable depends_on: - clone @@ -2258,22 +2228,14 @@ steps: image: grafana/build-container:1.4.3 name: build-backend-enterprise2 - commands: - - ./bin/grabpl gen-version v7.3.0-test + - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} + --no-pull-enterprise --sign v7.3.0-test depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - build-backend-enterprise2 - test-backend-enterprise2 - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} - --no-pull-enterprise --sign v7.3.0-test - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -2311,7 +2273,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -2408,7 +2370,11 @@ steps: - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test depends_on: - - gen-version + - build-plugins + - build-backend + - build-frontend + - build-backend-enterprise2 + - test-backend-enterprise2 environment: GITHUB_TOKEN: from_secret: github_token @@ -2489,7 +2455,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -2555,7 +2521,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go @@ -2667,10 +2633,11 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - make gen-go + - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable image: grafana/build-container:1.4.3 name: initialize @@ -2786,20 +2753,12 @@ steps: image: grafana/build-container:1.4.3 name: ensure-cuetsified - commands: - - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} + - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise + --sign depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise - --sign - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -2835,7 +2794,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -2890,7 +2849,7 @@ steps: - yarn storybook:build - ./bin/grabpl verify-storybook depends_on: - - package + - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 image: grafana/build-container:1.4.3 @@ -2936,7 +2895,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -2999,7 +2958,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -3019,6 +2978,7 @@ steps: - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone - make gen-go + - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable depends_on: - clone @@ -3166,22 +3126,14 @@ steps: image: grafana/build-container:1.4.3 name: build-backend-enterprise2 - commands: - - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} + - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} + --no-pull-enterprise --sign depends_on: - build-plugins - build-backend - build-frontend - - codespell - - shellcheck - build-backend-enterprise2 - test-backend-enterprise2 - image: grafana/build-container:1.4.3 - name: gen-version -- commands: - - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} - --no-pull-enterprise --sign - depends_on: - - gen-version environment: GITHUB_TOKEN: from_secret: github_token @@ -3219,7 +3171,7 @@ steps: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - - end-to-end-tests-server + - package image: grafana/build-container:1.4.3 name: copy-packages-for-docker - depends_on: @@ -3274,7 +3226,7 @@ steps: - yarn storybook:build - ./bin/grabpl verify-storybook depends_on: - - package + - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 image: grafana/build-container:1.4.3 @@ -3325,7 +3277,11 @@ steps: - ./bin/grabpl package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64 --sign depends_on: - - gen-version + - build-plugins + - build-backend + - build-frontend + - build-backend-enterprise2 + - test-backend-enterprise2 environment: GITHUB_TOKEN: from_secret: github_token @@ -3406,7 +3362,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.2/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.5.5/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -3529,6 +3485,6 @@ kind: secret name: drone_token --- kind: signature -hmac: 96d23b144a0a27bce871f7faf782827c17cc132492fe058a7c56768c543078c9 +hmac: 0d26eda19dc6e530d02c734704c8a9d01beb5082c7e14b2609577b8695ed06f5 ... diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star index 384870e9d3b..50c651d8f01 100644 --- a/scripts/drone/pipelines/main.star +++ b/scripts/drone/pipelines/main.star @@ -10,7 +10,6 @@ load( 'build_backend_step', 'build_frontend_step', 'build_plugins_step', - 'gen_version_step', 'package_step', 'e2e_tests_server_step', 'e2e_tests_step', @@ -69,7 +68,6 @@ def get_steps(edition, is_downstream=False): ensure_cuetsified_step(), ] - # Have to insert Enterprise2 steps before they're depended on (in the gen-version step) if include_enterprise2: edition2 = 'enterprise2' steps.extend([ @@ -81,8 +79,7 @@ def get_steps(edition, is_downstream=False): # Insert remaining steps steps.extend([ - gen_version_step(ver_mode=ver_mode, is_downstream=is_downstream, include_enterprise2=include_enterprise2), - package_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), + package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream), e2e_tests_server_step(edition=edition), e2e_tests_step(edition=edition), build_storybook_step(edition=edition, ver_mode=ver_mode), @@ -109,7 +106,7 @@ def get_steps(edition, is_downstream=False): if include_enterprise2: edition2 = 'enterprise2' steps.extend([ - package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream), + package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64'], is_downstream=is_downstream), e2e_tests_server_step(edition=edition2, port=3002), e2e_tests_step(edition=edition2, port=3002), upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream), diff --git a/scripts/drone/pipelines/pr.star b/scripts/drone/pipelines/pr.star index 23d7eccddf6..fdaa852afac 100644 --- a/scripts/drone/pipelines/pr.star +++ b/scripts/drone/pipelines/pr.star @@ -10,7 +10,6 @@ load( 'test_backend_step', 'test_backend_integration_step', 'test_frontend_step', - 'gen_version_step', 'package_step', 'e2e_tests_server_step', 'e2e_tests_step', @@ -61,7 +60,6 @@ def pr_pipelines(edition): ensure_cuetsified_step(), ] - # Have to insert Enterprise2 steps before they're depended on (in the gen-version step) if include_enterprise2: edition2 = 'enterprise2' steps.append(benchmark_ldap_step()) @@ -75,8 +73,7 @@ def pr_pipelines(edition): # Insert remaining steps steps.extend([ - gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2), - package_step(edition=edition, ver_mode=ver_mode, variants=variants), + package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=variants), e2e_tests_server_step(edition=edition), e2e_tests_step(edition=edition), build_storybook_step(edition=edition, ver_mode=ver_mode), @@ -93,7 +90,7 @@ def pr_pipelines(edition): steps.extend([ redis_integration_tests_step(), memcached_integration_tests_step(), - package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']), + package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']), e2e_tests_server_step(edition=edition2, port=3002), e2e_tests_step(edition=edition2, port=3002), ]) diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index 4829a093faa..40590d9f0f0 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -13,7 +13,6 @@ load( 'build_backend_step', 'build_frontend_step', 'build_plugins_step', - 'gen_version_step', 'package_step', 'e2e_tests_server_step', 'e2e_tests_step', @@ -97,7 +96,6 @@ def get_steps(edition, ver_mode): ensure_cuetsified_step(), ] - # Have to insert Enterprise2 steps before they're depended on (in the gen-version step) if include_enterprise2: edition2 = 'enterprise2' steps.extend([ @@ -109,8 +107,7 @@ def get_steps(edition, ver_mode): # Insert remaining steps steps.extend([ - gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2), - package_step(edition=edition, ver_mode=ver_mode), + package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2), e2e_tests_server_step(edition=edition), e2e_tests_step(edition=edition, tries=3), copy_packages_for_docker_step(), @@ -142,7 +139,7 @@ def get_steps(edition, ver_mode): if include_enterprise2: edition2 = 'enterprise2' steps.extend([ - package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']), + package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']), e2e_tests_server_step(edition=edition2, port=3002), e2e_tests_step(edition=edition2, port=3002, tries=3), upload_cdn_step(edition=edition2), diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 13cb807e034..e76344c7345 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1,6 +1,6 @@ load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token') -grabpl_version = '2.5.2' +grabpl_version = '2.5.5' build_image = 'grafana/build-container:1.4.3' publish_image = 'grafana/grafana-ci-deploy:1.3.1' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' @@ -48,9 +48,17 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de ] if ver_mode == 'release': + args = '${DRONE_TAG}' common_cmds.append('./bin/grabpl verify-version ${DRONE_TAG}') elif ver_mode == 'test-release': + args = test_release_ver common_cmds.append('./bin/grabpl verify-version {}'.format(test_release_ver)) + else: + if not is_downstream: + build_no = '${DRONE_BUILD_NUMBER}' + else: + build_no = '$${SOURCE_BUILD_NUMBER}' + args = '--build-id {}'.format(build_no) identify_runner_step = { 'name': 'identify-runner', @@ -62,6 +70,7 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de if install_deps: common_cmds.extend([ + './bin/grabpl gen-version {}'.format(args), 'yarn install --immutable', ]) if edition in ('enterprise', 'enterprise2'): @@ -184,7 +193,7 @@ def build_storybook_step(edition, ver_mode): 'image': build_image, 'depends_on': [ # Best to ensure that this step doesn't mess with what's getting built and packaged - 'package', + 'build-frontend', ], 'environment': { 'NODE_OPTIONS': '--max_old_space_size=4096', @@ -500,13 +509,11 @@ def shellcheck_step(): ], } -def gen_version_step(ver_mode, include_enterprise2=False, is_downstream=False): +def package_step(edition, ver_mode, include_enterprise2=False, variants=None, is_downstream=False): deps = [ 'build-plugins', 'build-backend', 'build-frontend', - 'codespell', - 'shellcheck', ] if include_enterprise2: sfx = '-enterprise2' @@ -515,28 +522,6 @@ def gen_version_step(ver_mode, include_enterprise2=False, is_downstream=False): 'test-backend' + sfx, ]) - if ver_mode == 'release': - args = '${DRONE_TAG}' - elif ver_mode == 'test-release': - args = test_release_ver - else: - if not is_downstream: - build_no = '${DRONE_BUILD_NUMBER}' - else: - build_no = '$${SOURCE_BUILD_NUMBER}' - args = '--build-id {}'.format(build_no) - - return { - 'name': 'gen-version', - 'image': build_image, - 'depends_on': deps, - 'commands': [ - './bin/grabpl gen-version {}'.format(args), - ], - } - - -def package_step(edition, ver_mode, variants=None, is_downstream=False): variants_str = '' if variants: variants_str = ' --variants {}'.format(','.join(variants)) @@ -584,11 +569,7 @@ def package_step(edition, ver_mode, variants=None, is_downstream=False): return { 'name': 'package' + enterprise2_suffix(edition), 'image': build_image, - 'depends_on': [ - # This step should have all the dependencies required for packaging, and should generate - # dist/grafana.version - 'gen-version', - ], + 'depends_on': deps, 'environment': env, 'commands': cmds, } @@ -661,7 +642,7 @@ def copy_packages_for_docker_step(): 'name': 'copy-packages-for-docker', 'image': build_image, 'depends_on': [ - 'end-to-end-tests-server', + 'package', ], 'commands': [ 'ls dist/*.tar.gz*',