Build pipeline: Cleanup build-main pipeline steps (#38484)

* Refactor dependencies * Regenerate drone.yml * Reorder steps in starlark files * Make build depend on test * Make test steps depend on lint * Make gen-version step depend on build steps * Refactor step dependencies * Move e2e-tests step before upload_cdn * Sync with main
4 years ago · 8a04af412e
parent 7faea40674
commit 8a04af412e
4 changed files with 47 additions and 71 deletions
--- a/.bingo/README.md
+++ b/.bingo/README.md
@ -2,13 +2,13 @@

 This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.

-* Run `bingo get` to install all tools having each own module file in this directory.
-* Run `bingo get <tool>` to install <tool> that have own module file in this directory.
-* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
-* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
-* For go: Import `.bingo/variables.go` to for variable names.
-* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
+- Run `bingo get` to install all tools having each own module file in this directory.
+- Run `bingo get <tool>` to install <tool> that have own module file in this directory.
+- For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
+- For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
+- For go: Import `.bingo/variables.go` to for variable names.
+- See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.

 ## Requirements

-* Go 1.14+
+- Go 1.14+
--- a/.drone.yml
+++ b/.drone.yml
@ -527,7 +527,6 @@ steps:
      from_secret: github_package_token
  depends_on:
  - end-to-end-tests
-  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -537,9 +536,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests

@ -551,7 +548,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 services:
 - name: postgres
@ -954,7 +951,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -964,9 +961,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests

@ -1372,7 +1367,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -1382,9 +1377,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests
  - redis-integration-tests
@ -1408,16 +1401,6 @@ steps:
  depends_on:
  - gen-version

- name: upload-cdn-assets-enterprise2
-  image: grafana/grafana-ci-deploy:1.3.1
-  commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
-  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
-      from_secret: gcp_key
-  depends_on:
-  - package-enterprise2
-
 - name: end-to-end-tests-server-enterprise2
  image: grafana/build-container:1.4.1
  detach: true
@ -1440,6 +1423,16 @@ steps:
  depends_on:
  - end-to-end-tests-server-enterprise2

+- name: upload-cdn-assets-enterprise2
+  image: grafana/grafana-ci-deploy:1.3.1
+  commands:
+  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
+  environment:
+    GCP_GRAFANA_UPLOAD_KEY:
+      from_secret: gcp_key
+  depends_on:
+  - end-to-end-tests-server-enterprise2
+
 - name: upload-packages-enterprise2
  image: grafana/grafana-ci-deploy:1.3.1
  commands:
@ -1448,9 +1441,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package-enterprise2
  - end-to-end-tests-enterprise2
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests
  - redis-integration-tests
@ -1900,7 +1891,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -1910,9 +1901,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests

@ -2307,7 +2296,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -2317,9 +2306,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests
  - redis-integration-tests
@ -2343,16 +2330,6 @@ steps:
  depends_on:
  - gen-version

- name: upload-cdn-assets-enterprise2
-  image: grafana/grafana-ci-deploy:1.3.1
-  commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
-  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
-      from_secret: gcp_key
-  depends_on:
-  - package-enterprise2
-
 - name: end-to-end-tests-server-enterprise2
  image: grafana/build-container:1.4.1
  detach: true
@ -2375,6 +2352,16 @@ steps:
  depends_on:
  - end-to-end-tests-server-enterprise2

+- name: upload-cdn-assets-enterprise2
+  image: grafana/grafana-ci-deploy:1.3.1
+  commands:
+  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
+  environment:
+    GCP_GRAFANA_UPLOAD_KEY:
+      from_secret: gcp_key
+  depends_on:
+  - end-to-end-tests-server-enterprise2
+
 - name: upload-packages-enterprise2
  image: grafana/grafana-ci-deploy:1.3.1
  commands:
@ -2383,9 +2370,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package-enterprise2
  - end-to-end-tests-enterprise2
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests
  - redis-integration-tests
@ -2831,7 +2816,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -2841,9 +2826,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests

@ -3216,7 +3199,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
+  - end-to-end-tests-server

 - name: upload-packages
  image: grafana/grafana-ci-deploy:1.3.1
@ -3226,9 +3209,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package
  - end-to-end-tests
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests
  - redis-integration-tests
@ -3252,16 +3233,6 @@ steps:
  depends_on:
  - gen-version

- name: upload-cdn-assets-enterprise2
-  image: grafana/grafana-ci-deploy:1.3.1
-  commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
-  environment:
-    GCP_GRAFANA_UPLOAD_KEY:
-      from_secret: gcp_key
-  depends_on:
-  - package-enterprise2
-
 - name: end-to-end-tests-server-enterprise2
  image: grafana/build-container:1.4.1
  detach: true
@ -3284,6 +3255,16 @@ steps:
  depends_on:
  - end-to-end-tests-server-enterprise2

+- name: upload-cdn-assets-enterprise2
+  image: grafana/grafana-ci-deploy:1.3.1
+  commands:
+  - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
+  environment:
+    GCP_GRAFANA_UPLOAD_KEY:
+      from_secret: gcp_key
+  depends_on:
+  - end-to-end-tests-server-enterprise2
+
 - name: upload-packages-enterprise2
  image: grafana/grafana-ci-deploy:1.3.1
  commands:
@ -3292,9 +3273,7 @@ steps:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
  depends_on:
-  - package-enterprise2
  - end-to-end-tests-enterprise2
-  - end-to-end-tests-server
  - mysql-integration-tests
  - postgres-integration-tests
  - redis-integration-tests
@ -3499,6 +3478,6 @@ get:

 ---
 kind: signature
-hmac: 56e9f30fa716aff37a2d3db8534dc0ad489270905f740f3772499a837beaa85c
+hmac: da2adb3b1a629dad5050630a1ea2923c994647223dbe6efde88dcfea8faebcc1

 ...
--- a/scripts/lib.star
+++ b/scripts/lib.star
@ -320,7 +320,7 @@ def upload_cdn(edition):
        'name': 'upload-cdn-assets' + enterprise2_sfx(edition),
        'image': publish_image,
        'depends_on': [
-            'package' + enterprise2_sfx(edition),
+            'end-to-end-tests-server' + enterprise2_sfx(edition),
        ],
        'environment': {
            'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'),
@ -829,7 +829,6 @@ def release_canary_npm_packages_step(edition):
        'image': build_image,
        'depends_on': [
            'end-to-end-tests',
-            'end-to-end-tests-server',
        ],
        'environment': {
            'GITHUB_PACKAGE_TOKEN': from_secret('github_package_token'),
@ -877,9 +876,7 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
        cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)

    dependencies = [
-        'package' + enterprise2_sfx(edition),
        'end-to-end-tests' + enterprise2_sfx(edition),
-        'end-to-end-tests-server',
        'mysql-integration-tests',
        'postgres-integration-tests',
    ]
--- a/scripts/release.star
+++ b/scripts/release.star
@ -123,9 +123,9 @@ def get_steps(edition, ver_mode):
        edition2 = 'enterprise2'
        steps.extend([
            package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
-            upload_cdn(edition=edition2),
            e2e_tests_server_step(edition=edition2, port=3002),
            e2e_tests_step(edition=edition2, port=3002, tries=3),
+            upload_cdn(edition=edition2),
        ])
        if should_upload:
            steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))