Fix new release pipeline

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

.circleci/config.yml

@@ -7,6 +7,11 @@ aliases:
       ignore: /.*/
     tags:
       only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+  - &filter-only-release-test
+    branches:
+      ignore: /.*/
+    tags:
+      only: /^vtest-new-release-pipeline$/
   - &filter-not-release-or-master
     tags:
       ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
@@ -15,6 +20,16 @@ aliases:
   - &filter-only-master
     branches:
       only: master
+  - &filter-master-or-release
+    branches:
+      only: master
+    tags:
+      only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+  - &filter-master-or-release-test
+    branches:
+      ignore: /.*/
+    tags:
+      only: /^vtest-new-release-pipeline$/
 
 executors:
   grafana-build:
@@ -72,8 +87,13 @@ jobs:
       - run:
           name: Build Grafana backend
           command: |
-            /tmp/workspace/bin/grabpl build-backend --edition << parameters.edition >> \
+            if [[ -z $CIRCLE_TAG ]]; then
-              --variants << parameters.variant >> --build-id $CIRCLE_WORKFLOW_ID
+              /tmp/workspace/bin/grabpl build-backend --edition << parameters.edition >> \
+                --variants << parameters.variant >> --build-id $CIRCLE_WORKFLOW_ID
+            else
+              /tmp/workspace/bin/grabpl build-backend --edition << parameters.edition >> \
+                --variants << parameters.variant >> $CIRCLE_TAG
+            fi
       - run:
           name: Move artifacts
           command: mkdir -p << parameters.edition >> && mv bin << parameters.edition >>/
@@ -279,7 +299,12 @@ jobs:
           command: cp -r /tmp/workspace/oss/* .
       - run:
           name: Package Grafana
-          command: /tmp/workspace/bin/grabpl package --edition oss --build-id $CIRCLE_WORKFLOW_ID
+          command: |
+            if [[ -z $CIRCLE_TAG ]]; then
+              /tmp/workspace/bin/grabpl package --edition oss --build-id $CIRCLE_WORKFLOW_ID
+            else
+              /tmp/workspace/bin/grabpl package --edition oss $CIRCLE_TAG
+            fi
       - run:
           name: Move artifacts
           command: |
@@ -312,7 +337,12 @@ jobs:
           command: cp -r /tmp/workspace/enterprise/* .
       - run:
           name: Package Grafana
-          command: /tmp/workspace/bin/grabpl package --edition enterprise --build-id $CIRCLE_WORKFLOW_ID
+          command: |
+            if [[ -z $CIRCLE_TAG ]]; then
+              /tmp/workspace/bin/grabpl package --edition enterprise --build-id $CIRCLE_WORKFLOW_ID
+            else
+              /tmp/workspace/bin/grabpl package --edition enterprise $CIRCLE_TAG
+            fi
       - run:
           name: Move artifacts
           command: |
@@ -331,7 +361,11 @@ jobs:
           command: ./scripts/ci-job-succeeded.sh
           when: on_success
 
-  publish-oss-master:
+  publish-packages:
+    description: "Publish packages"
+    parameters:
+      edition:
+        type: string
     executor: grafana-publish
     steps:
       - attach_workspace:
@@ -341,51 +375,16 @@ jobs:
           name: CI job started
           command: ./scripts/ci-job-started.sh
       - run:
-          name: GCP credentials
+          name: Publish packages
-          command: echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json
+          command: /tmp/workspace/bin/grabpl publish-packages --edition << parameters.edition >> --deb-db-bucket grafana-aptly-db-test --deb-repo-bucket grafana-repo-test --packages-bucket grafana-downloads-test --simulate-release
-      - run:
-          name: Sign in to GCP
-          command: /opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json
-      - run:
-          name: Publish to GCP
-          command: |
-            /opt/google-cloud-sdk/bin/gsutil cp /tmp/workspace/oss/dist/* gs://$GCP_BUCKET_NAME/oss/master/
-      - run:
-          name: Publish to Grafana.com
-          command: |
-            cp -r /tmp/workspace/oss/dist .
-            rm -f dist/*latest*
-            cd dist
-            /tmp/workspace/scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly
 
-  publish-enterprise-master:
+  build-docker-images:
-    executor: grafana-publish
+    description: "Build Docker images"
-    steps:
+    parameters:
-      - attach_workspace:
+      edition:
-          at: /tmp/workspace
+        type: string
-      - checkout
+      ubuntu:
-      - run:
+        type: boolean
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run:
-          name: GCP credentials
-          command: echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json
-      - run:
-          name: Sign in to GCP
-          command: /opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json
-      - run:
-          name: Publish to GCP
-          command: |
-            /opt/google-cloud-sdk/bin/gsutil cp /tmp/workspace/enterprise/dist/* gs://$GCP_BUCKET_NAME/enterprise/master/
-      - run:
-          name: Publish to Grafana.com
-          command: |
-            cp -r /tmp/workspace/enterprise/dist .
-            rm -f dist/*latest*
-            cd dist
-            /tmp/workspace/scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly
-
-  docker-oss-master:
     executor: docker
     steps:
       - attach_workspace:
@@ -395,32 +394,20 @@ jobs:
           name: CI job started
           command: ./scripts/ci-job-started.sh
       - run: docker info
+      # XXX: Is this necessary?
       - run: docker run --privileged linuxkit/binfmt:v0.6
       - run:
           name: Copy Grafana archives
           command: |
-            cp /tmp/workspace/oss/dist/grafana-*.linux-amd64-musl.tar.gz packaging/docker/grafana-latest.linux-x64-musl.tar.gz
+            cp -r /tmp/workspace/<< parameters.edition >>/dist .
-            cp /tmp/workspace/oss/dist/grafana-*.linux-armv7-musl.tar.gz packaging/docker/grafana-latest.linux-armv7-musl.tar.gz
-            cp /tmp/workspace/oss/dist/grafana-*.linux-arm64-musl.tar.gz packaging/docker/grafana-latest.linux-arm64-musl.tar.gz
       - run:
           name: Build Docker images
           command: |
-            pushd packaging/docker && ./build.sh "master-${CIRCLE_SHA1}" && popd
+            /tmp/workspace/bin/grabpl build-docker --edition << parameters.edition >> --ubuntu << parameters.ubuntu >> $CIRCLE_WORKFLOW_ID
-            mkdir docker
-            docker save -o docker/grafana-oss-amd64.tar "grafana/grafana:master-${CIRCLE_SHA1}"
-            docker save -o docker/grafana-oss-arm32v7.tar "grafana/grafana-arm32v7-linux:master-${CIRCLE_SHA1}"
-            docker save -o docker/grafana-oss-arm64v8.tar "grafana/grafana-arm64v8-linux:master-${CIRCLE_SHA1}"
-      # Publish dev image, since e2e tests need it
-      - run:
-          name: Publish development Docker image
-          command: |
-            docker tag "grafana/grafana:master-${CIRCLE_SHA1}" "grafana/grafana-dev:master-${CIRCLE_SHA1}"
-            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-            docker push "grafana/grafana-dev:master-${CIRCLE_SHA1}"
       - persist_to_workspace:
           root: .
           paths:
-            - docker/grafana-oss*.tar
+            - docker/*.tar
       - run:
           name: CI job failed
           command: ./scripts/ci-job-failed.sh
@@ -430,143 +417,13 @@ jobs:
           command: ./scripts/ci-job-succeeded.sh
           when: on_success
 
-  docker-ubuntu-oss-master:
+  publish-docker-images:
-    executor: docker
+    description: Publish Docker images
-    steps:
+    parameters:
-      - attach_workspace:
+      edition:
-          at: /tmp/workspace
+        type: string
-      - checkout
+      ubuntu:
-      - run:
+        type: boolean
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run: docker info
-      - run: docker run --privileged linuxkit/binfmt:v0.6
-      - run:
-          name: Copy Grafana archives
-          command: |
-            cp /tmp/workspace/oss/dist/grafana-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-            cp /tmp/workspace/oss/dist/grafana-*.linux-armv7.tar.gz packaging/docker/grafana-latest.linux-armv7.tar.gz
-            cp /tmp/workspace/oss/dist/grafana-*.linux-arm64.tar.gz packaging/docker/grafana-latest.linux-arm64.tar.gz
-      - run:
-          name: Build Docker images
-          command: |
-            pushd packaging/docker && ./build.sh --ubuntu "master-${CIRCLE_SHA1}" && popd
-            mkdir docker
-            docker save -o docker/grafana-oss-amd64-ubuntu.tar "grafana/grafana:master-${CIRCLE_SHA1}-ubuntu"
-            docker save -o docker/grafana-oss-arm32v7-ubuntu.tar "grafana/grafana-arm32v7-linux:master-${CIRCLE_SHA1}-ubuntu"
-            docker save -o docker/grafana-oss-arm64v8-ubuntu.tar "grafana/grafana-arm64v8-linux:master-${CIRCLE_SHA1}-ubuntu"
-      - persist_to_workspace:
-          root: .
-          paths:
-            - docker/grafana-oss*.tar
-      - run:
-          name: CI job failed
-          command: ./scripts/ci-job-failed.sh
-          when: on_fail
-      - run:
-          name: CI job succeeded
-          command: ./scripts/ci-job-succeeded.sh
-          when: on_success
-
-  docker-enterprise-master:
-    executor: docker
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run: docker info
-      - run: docker run --privileged linuxkit/binfmt:v0.6
-      - run:
-          name: Copy Grafana archives
-          command: |
-            cp /tmp/workspace/enterprise/dist/grafana-enterprise-*.linux-amd64-musl.tar.gz packaging/docker/grafana-latest.linux-x64-musl.tar.gz
-            cp /tmp/workspace/enterprise/dist/grafana-enterprise-*.linux-armv7-musl.tar.gz packaging/docker/grafana-latest.linux-armv7-musl.tar.gz
-            cp /tmp/workspace/enterprise/dist/grafana-enterprise-*.linux-arm64-musl.tar.gz packaging/docker/grafana-latest.linux-arm64-musl.tar.gz
-      - run:
-          name: Build Docker images
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            pushd packaging/docker
-            docker build -t "grafana/grafana-enterprise:master" --no-cache=true .
-            docker build -t "grafana/grafana-enterprise-arm32v7-linux:master" \
-              --build-arg BASE_IMAGE=arm32v7/alpine:3.10 \
-              --build-arg GRAFANA_TGZ=grafana-latest.linux-armv7-musl.tar.gz \
-              --no-cache=true .
-            docker build -t "grafana/grafana-enterprise-arm64v8-linux:master" \
-              --build-arg BASE_IMAGE=arm64v8/alpine:3.10 \
-              --build-arg GRAFANA_TGZ=grafana-latest.linux-arm64-musl.tar.gz \
-              --no-cache=true .
-            popd
-            mkdir docker
-            docker save -o docker/grafana-enterprise-amd64.tar "grafana/grafana-enterprise:master"
-            docker save -o docker/grafana-enterprise-arm32v7.tar "grafana/grafana-enterprise-arm32v7-linux:master"
-            docker save -o docker/grafana-enterprise-arm64v8.tar "grafana/grafana-enterprise-arm64v8-linux:master"
-      - persist_to_workspace:
-          root: .
-          paths:
-            - docker/grafana-enterprise*.tar
-      - run:
-          name: CI job failed
-          command: ./scripts/ci-job-failed.sh
-          when: on_fail
-      - run:
-          name: CI job succeeded
-          command: ./scripts/ci-job-succeeded.sh
-          when: on_success
-
-  docker-ubuntu-enterprise-master:
-    executor: docker
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run: docker info
-      - run: docker run --privileged linuxkit/binfmt:v0.6
-      - run:
-          name: Copy Grafana archives
-          command: |
-            cp /tmp/workspace/enterprise/dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-            cp /tmp/workspace/enterprise/dist/grafana-enterprise-*.linux-armv7.tar.gz packaging/docker/grafana-latest.linux-armv7.tar.gz
-            cp /tmp/workspace/enterprise/dist/grafana-enterprise-*.linux-arm64.tar.gz packaging/docker/grafana-latest.linux-arm64.tar.gz
-      - run:
-          name: Build Docker images
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            pushd packaging/docker
-            docker build -t "grafana/grafana-enterprise:master-ubuntu" --no-cache=true -f ubuntu.Dockerfile .
-            docker build -t "grafana/grafana-enterprise-arm32v7-linux:master-ubuntu" \
-              --build-arg BASE_IMAGE=arm32v7/ubuntu:19.10 \
-              --build-arg GRAFANA_TGZ=grafana-latest.linux-armv7.tar.gz \
-              --no-cache=true -f ubuntu.Dockerfile .
-            docker build -t "grafana/grafana-enterprise-arm64v8-linux:master-ubuntu" \
-              --build-arg BASE_IMAGE=arm64v8/ubuntu:19.10 \
-              --build-arg GRAFANA_TGZ=grafana-latest.linux-arm64.tar.gz \
-              --no-cache=true -f ubuntu.Dockerfile .
-            popd
-            mkdir docker
-            docker save -o docker/grafana-enterprise-amd64-ubuntu.tar "grafana/grafana-enterprise:master-ubuntu"
-            docker save -o docker/grafana-enterprise-arm32v7-ubuntu.tar "grafana/grafana-enterprise-arm32v7-linux:master-ubuntu"
-            docker save -o docker/grafana-enterprise-arm64v8-ubuntu.tar "grafana/grafana-enterprise-arm64v8-linux:master-ubuntu"
-      - persist_to_workspace:
-          root: .
-          paths:
-            - docker/grafana-enterprise*.tar
-      - run:
-          name: CI job failed
-          command: ./scripts/ci-job-failed.sh
-          when: on_fail
-      - run:
-          name: CI job succeeded
-          command: ./scripts/ci-job-succeeded.sh
-          when: on_success
-
-  publish-docker-oss-master:
     executor: docker
     steps:
       - attach_workspace:
@@ -576,175 +433,12 @@ jobs:
           name: CI job started
           command: ./scripts/ci-job-started.sh
       - run:
-          name: Load Docker images
+          name: Copy artifacts from workspace
-          command: |
+          command: cp -r /tmp/workspace/<< parameters.edition >>/docker .
-            docker load -i /tmp/workspace/docker/grafana-oss-amd64.tar
-            docker load -i /tmp/workspace/docker/grafana-oss-arm32v7.tar
-            docker load -i /tmp/workspace/docker/grafana-oss-arm64v8.tar
-      - run:
-          name: Log into Docker Hub
-          command: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
       - run:
           name: Publish Docker images
           command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
+            /tmp/workspace/bin/grabpl publish-docker --edition << parameters.edition >> --ubuntu << parameters.ubuntu >> --dry-run
-            docker tag "grafana/grafana:master-${CIRCLE_SHA1}" "grafana/grafana:master"
-            docker push "grafana/grafana:master"
-            docker tag "grafana/grafana-arm32v7-linux:master-${CIRCLE_SHA1}" "grafana/grafana-arm32v7-linux:master"
-            docker push "grafana/grafana-arm32v7-linux:master"
-            docker tag "grafana/grafana-arm64v8-linux:master-${CIRCLE_SHA1}" "grafana/grafana-arm64v8-linux:master"
-            docker push "grafana/grafana-arm64v8-linux:master"
-      - run:
-          name: Publish Docker manifest
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker manifest create "grafana/grafana:master" \
-              "grafana/grafana:master" \
-              "grafana/grafana-arm32v7-linux:master" \
-              "grafana/grafana-arm64v8-linux:master"
-            docker manifest push "grafana/grafana:master"
-      - run:
-          name: CI job failed
-          command: ./scripts/ci-job-failed.sh
-          when: on_fail
-      - run:
-          name: CI job succeeded
-          command: ./scripts/ci-job-succeeded.sh
-          when: on_success
-
-  publish-docker-ubuntu-oss-master:
-    executor: docker
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run:
-          name: Load Docker images
-          command: |
-            mkdir docker
-            docker load -i /tmp/workspace/docker/grafana-oss-amd64-ubuntu.tar
-            docker load -i /tmp/workspace/docker/grafana-oss-arm32v7-ubuntu.tar
-            docker load -i /tmp/workspace/docker/grafana-oss-arm64v8-ubuntu.tar
-      - run:
-          name: Log into Docker Hub
-          command: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-      - run:
-          name: Publish Docker images
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker tag "grafana/grafana:master-${CIRCLE_SHA1}-ubuntu" "grafana/grafana:master-ubuntu"
-            docker push "grafana/grafana:master-ubuntu"
-            docker tag "grafana/grafana-arm32v7-linux:master-${CIRCLE_SHA1}-ubuntu" "grafana/grafana-arm32v7-linux:master-ubuntu"
-            docker push "grafana/grafana-arm32v7-linux:master-ubuntu"
-            docker tag "grafana/grafana-arm64v8-linux:master-${CIRCLE_SHA1}-ubuntu" "grafana/grafana-arm64v8-linux:master-ubuntu"
-            docker push "grafana/grafana-arm64v8-linux:master-ubuntu"
-      - run:
-          name: Publish Docker manifest
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker manifest create "grafana/grafana:master-ubuntu" \
-              "grafana/grafana:master-ubuntu" \
-              "grafana/grafana-arm32v7-linux:master-ubuntu" \
-              "grafana/grafana-arm64v8-linux:master-ubuntu"
-            docker manifest push "grafana/grafana:master-ubuntu"
-      - run:
-          name: CI job failed
-          command: ./scripts/ci-job-failed.sh
-          when: on_fail
-      - run:
-          name: CI job succeeded
-          command: ./scripts/ci-job-succeeded.sh
-          when: on_success
-
-  publish-docker-enterprise-master:
-    executor: docker
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run:
-          name: Load Docker images
-          command: |
-            mkdir docker
-            docker load -i /tmp/workspace/docker/grafana-enterprise-amd64.tar
-            docker load -i /tmp/workspace/docker/grafana-enterprise-arm32v7.tar
-            docker load -i /tmp/workspace/docker/grafana-enterprise-arm64v8.tar
-      - run:
-          name: Log into Docker Hub
-          command: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-      - run:
-          name: Publish Docker images
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker push "grafana/grafana-enterprise:master"
-            docker push "grafana/grafana-enterprise-arm32v7-linux:master"
-            docker push "grafana/grafana-enterprise-arm64v8-linux:master"
-      - run:
-          name: Publish Docker manifest
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker manifest create "grafana/grafana-enterprise:master" \
-              "grafana/grafana-enterprise:master" \
-              "grafana/grafana-enterprise-arm32v7-linux:master" \
-              "grafana/grafana-enterprise-arm64v8-linux:master"
-            docker manifest push "grafana/grafana-enterprise:master"
-      - run:
-          name: CI job failed
-          command: ./scripts/ci-job-failed.sh
-          when: on_fail
-      - run:
-          name: CI job succeeded
-          command: ./scripts/ci-job-succeeded.sh
-          when: on_success
-
-  publish-docker-ubuntu-enterprise-master:
-    executor: docker
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run:
-          name: CI job started
-          command: ./scripts/ci-job-started.sh
-      - run:
-          name: Load Docker images
-          command: |
-            mkdir docker
-            docker load -i /tmp/workspace/docker/grafana-enterprise-amd64-ubuntu.tar
-            docker load -i /tmp/workspace/docker/grafana-enterprise-arm32v7-ubuntu.tar
-            docker load -i /tmp/workspace/docker/grafana-enterprise-arm64v8-ubuntu.tar
-      - run:
-          name: Log into Docker Hub
-          command: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-      - run:
-          name: Publish Docker images
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker push "grafana/grafana-enterprise:master-ubuntu"
-            docker push "grafana/grafana-enterprise-arm32v7-linux:master-ubuntu"
-            docker push "grafana/grafana-enterprise-arm64v8-linux:master-ubuntu"
-
-            # Publish dev image
-            docker tag "grafana/grafana-enterprise:master-ubuntu" \
-              "grafana/grafana-enterprise-dev:master-${CIRCLE_SHA1}"
-            docker push "grafana/grafana-enterprise-dev:master-${CIRCLE_SHA1}"
-            # deploy to kubernetes
-            ./packaging/docker/deploy_to_k8s.sh "grafana/grafana-enterprise-dev:master-${CIRCLE_SHA1}"
-      - run:
-          name: Publish Docker manifest
-          command: |
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker manifest create "grafana/grafana-enterprise:master-ubuntu" \
-              "grafana/grafana-enterprise:master-ubuntu" \
-              "grafana/grafana-enterprise-arm32v7-linux:master-ubuntu" \
-              "grafana/grafana-enterprise-arm64v8-linux:master-ubuntu"
-            docker manifest push "grafana/grafana-enterprise:master-ubuntu"
       - run:
           name: CI job failed
           command: ./scripts/ci-job-failed.sh
@@ -1727,6 +1421,32 @@ jobs:
           command: './scripts/ci-job-succeeded.sh'
           when: on_success
 
+  release-packages-test:
+    docker:
+      - image: circleci/node:12
+    steps:
+      - checkout
+      - run:
+          name: CI job started
+          command: './scripts/ci-job-started.sh'
+      - run:
+          name: Bootstrap lerna
+          command: 'npx lerna bootstrap'
+      - run:
+          name: npm - Prepare auth token
+          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
+      - run:
+          name: Release packages
+          command: echo ./scripts/build/release-packages.sh "${CIRCLE_TAG}"
+      - run:
+          name: CI job failed
+          command: './scripts/ci-job-failed.sh'
+          when: on_fail
+      - run:
+          name: CI job succeeded
+          command: './scripts/ci-job-succeeded.sh'
+          when: on_success
+
   scan-docker-master:
     docker:
       - image: circleci/buildpack-deps:stretch
@@ -1764,180 +1484,180 @@ workflows:
   build-pipeline:
     jobs:
       - install-grabpl:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: armv6
           name: build-oss-backend-armv6
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: armv7
           name: build-oss-backend-armv7
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: armv7-musl
           name: build-oss-backend-armv7-musl
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: arm64
           name: build-oss-backend-arm64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: arm64-musl
           name: build-oss-backend-arm64-musl
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: osx64
           name: build-oss-backend-osx64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: win64
           name: build-oss-backend-win64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: linux-x64
           name: build-oss-backend-linux-x64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: oss
           variant: linux-x64-musl
           name: build-oss-backend-linux-x64-musl
           requires:
             - install-grabpl
       - build-frontend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           name: build-oss-frontend
           edition: oss
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: armv6
           name: build-enterprise-backend-armv6
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: armv7
           name: build-enterprise-backend-armv7
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: armv7-musl
           name: build-enterprise-backend-armv7-musl
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: arm64
           name: build-enterprise-backend-arm64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: arm64-musl
           name: build-enterprise-backend-arm64-musl
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: osx64
           name: build-enterprise-backend-osx64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: win64
           name: build-enterprise-backend-win64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: linux-x64
           name: build-enterprise-backend-linux-x64
           requires:
             - install-grabpl
       - build-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           edition: enterprise
           variant: linux-x64-musl
           name: build-enterprise-backend-linux-x64-musl
           requires:
             - install-grabpl
       - build-frontend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           name: build-enterprise-frontend
           edition: enterprise
           requires:
             - install-grabpl
       - build-release-publisher:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
       - codespell:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
       - lint-go:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
       - shellcheck-grabpl:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
       - test-backend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
             - lint-go
       - test-frontend:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
       - mysql-integration-test:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
             - lint-go
       - postgres-integration-test:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
             - lint-go
       - package-oss:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
             - build-oss-backend-armv6
@@ -1957,7 +1677,7 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
       - package-enterprise:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - install-grabpl
             - build-enterprise-backend-armv6
@@ -1977,72 +1697,107 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
       - build-oss-windows-installer:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - package-oss
       - build-enterprise-windows-installer:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
             - package-enterprise
       - release-next-packages:
           filters: *filter-only-master
           requires:
             - test-frontend
-      - publish-oss-master:
+      - release-packages-test:
-          filters: *filter-only-master
+          filters: *filter-only-release-test
+          requires:
+            - end-to-end-tests
+            # TODO: Do we have more dependencies?
+      - publish-packages:
+          filters: *filter-master-or-release-test
+          name: publish-oss-packages
+          edition: oss
           requires:
             - package-oss
             - build-oss-windows-installer
             - end-to-end-tests
             - build-release-publisher
-      - docker-oss-master:
+      - publish-packages:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
-          requires:
+          name: publish-enterprise-packages
-            - package-oss
+          edition: enterprise
-            - build-oss-windows-installer
-      - docker-ubuntu-oss-master:
-          filters: *filter-only-master
-          requires:
-            - package-oss
-            - build-oss-windows-installer
-      - publish-enterprise-master:
-          filters: *filter-only-master
           requires:
             - package-enterprise
             - build-enterprise-windows-installer
             - end-to-end-tests
             - build-release-publisher
-      - docker-enterprise-master:
+      - build-docker-images:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
+          name: build-oss-docker-images
+          edition: oss
+          ubuntu: false
+          requires:
+            - package-oss
+            - build-oss-windows-installer
+      - build-docker-images:
+          filters: *filter-master-or-release-test
+          name: build-oss-ubuntu-docker-images
+          edition: oss
+          ubuntu: true
+          requires:
+            - package-oss
+            - build-oss-windows-installer
+      - build-docker-images:
+          filters: *filter-master-or-release-test
+          name: build-enterprise-docker-images
+          edition: enterprise
+          ubuntu: false
           requires:
             - package-enterprise
-      - docker-ubuntu-enterprise-master:
+            - build-enterprise-windows-installer
-          filters: *filter-only-master
+      - build-docker-images:
+          filters: *filter-master-or-release-test
+          name: build-enterprise-ubuntu-docker-images
+          edition: enterprise
+          ubuntu: true
           requires:
             - package-enterprise
+            - build-enterprise-windows-installer
       - end-to-end-tests:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
           requires:
-            - docker-oss-master
+            - build-oss-docker-images
-      - publish-docker-oss-master:
+      - publish-docker-images:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
+          name: publish-oss-docker-images
+          edition: oss
+          ubuntu: false
           requires:
-            - docker-oss-master
+            - build-oss-docker-images
             - end-to-end-tests
-      - publish-docker-ubuntu-oss-master:
+      - publish-docker-images:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
+          name: publish-oss-ubuntu-docker-images
+          edition: oss
+          ubuntu: true
           requires:
-            - docker-ubuntu-oss-master
+            - build-oss-ubuntu-docker-images
             - end-to-end-tests
-      - publish-docker-enterprise-master:
+      - publish-docker-images:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
+          name: publish-enterprise-docker-images
+          edition: enterprise
+          ubuntu: false
           requires:
-            - docker-enterprise-master
+            - build-enterprise-docker-images
             - end-to-end-tests
-      - publish-docker-ubuntu-enterprise-master:
+      - publish-docker-images:
-          filters: *filter-only-master
+          filters: *filter-master-or-release-test
+          name: publish-enterprise-ubuntu-docker-images
+          edition: enterprise
+          ubuntu: true
           requires:
-            - docker-ubuntu-enterprise-master
+            - build-enterprise-ubuntu-docker-images
             - end-to-end-tests
 
   release: