From 12776412ebd14e5da0d344cce3319dd94ede0824 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Thu, 15 Jul 2021 09:14:53 +1000
Subject: [PATCH] DCD-1313: Remove soon-to-be-EODed JDK8 builds that are
 incompatible with the DC test license.

---
 bitbucket-pipelines.yml | 660 ++--------------------------------------
 pipelines-generator.py  |  13 +-
 2 files changed, 26 insertions(+), 647 deletions(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 04e9faf..1a55595 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -27,306 +27,6 @@ pipelines:
       - parallel:
 
 
-        - step:
-            name: JDK 8 - Batch 1
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='0' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 2
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='1' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 3
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='2' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 4
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='3' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 5
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='4' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 6
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='5' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 7
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='6' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 8
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='7' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 9
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='8' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 10
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='9' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 11
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='10' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 12
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python  /usr/src/app/make-releases.py \
-                  --update \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='11' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
         - step:
             name: JDK 11 - Batch 1
             services:
@@ -337,7 +37,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -362,7 +62,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -387,7 +87,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -412,7 +112,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -437,7 +137,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -462,7 +162,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -487,7 +187,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -512,7 +212,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -537,7 +237,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -562,7 +262,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -587,7 +287,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -612,7 +312,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -646,318 +346,6 @@ pipelines:
       - parallel:
 
 
-        - step:
-            name: JDK 8 - Batch 1
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='0' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 2
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='1' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 3
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='2' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 4
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='3' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 5
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='4' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 6
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='5' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 7
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='6' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 8
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='7' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 9
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='8' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 10
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='9' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 11
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='10' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
-        - step:
-            name: JDK 8 - Batch 12
-            services:
-              - docker
-            script:
-              - git submodule update --init --recursive
-              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-              - >
-                python /usr/src/app/make-releases.py \
-                  --create \
-                  --create-eap \
-                  --start-version='6' \
-                  --end-version='7.1' \
-                  --default-release \
-                  --dockerfile='Dockerfile' \
-                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot' \
-                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
-                  --mac-product-key='confluence' \
-                  --tag-suffixes='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' \
-                  --concurrent-builds='1' \
-                  --job-offset='11' \
-                  --jobs-total='12' \
-                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
-                  --push
- 
-
         - step:
             name: JDK 11 - Batch 1
             services:
@@ -969,7 +357,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -995,7 +383,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1021,7 +409,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1047,7 +435,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1073,7 +461,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1099,7 +487,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1125,7 +513,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1151,7 +539,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1177,7 +565,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1203,7 +591,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1229,7 +617,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -1255,7 +643,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.1' \
+                  --start-version='7.2' \
                   --end-version='8' \
                   --default-release \
                   --dockerfile='Dockerfile' \
diff --git a/pipelines-generator.py b/pipelines-generator.py
index ba7d865..688cbf4 100755
--- a/pipelines-generator.py
+++ b/pipelines-generator.py
@@ -7,18 +7,9 @@ TEMPLATE_FILE = 'bitbucket-pipelines.yml.j2'
 REPOS = ['atlassian/confluence', 'atlassian/confluence-server']
 
 images = {
-    'Conf': {
-        8: {
-            'start_version': '6',
-            'end_version': '7.1',
-            'default_release': True,
-            'base_image': 'adoptopenjdk:8-hotspot',
-            'tag_suffixes': ['adoptopenjdk8', 'jdk8', 'ubuntu', 'ubuntu-18.04-adoptopenjdk8'],
-            'dockerfile': 'Dockerfile',
-            'docker_repos': REPOS,
-        },
+    'Confluence': {
         11: {
-            'start_version': '7.1',
+            'start_version': '7.2',
             'end_version': '8',
             'default_release': True,
             'base_image': 'adoptopenjdk:11-hotspot',