Merged in CLIP-1770-split-eap-builds (pull request #130)

CLIP-1770: Split EAP builds so they don't interfere with supported releases.

Approved-by: Eugene Ivantsov
Approved-by: Jun Jeong
Approved-by: Adam Brokes

bitbucket-pipelines.yml

@@ -49,7 +49,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 2
@@ -73,7 +73,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 3
@@ -97,7 +97,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 4
@@ -121,7 +121,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 5
@@ -145,7 +145,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 6
@@ -169,7 +169,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 7
@@ -193,7 +193,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 8
@@ -217,7 +217,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 1
@@ -240,7 +240,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 2
@@ -263,7 +263,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 3
@@ -286,7 +286,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 4
@@ -309,7 +309,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 5
@@ -332,7 +332,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 6
@@ -355,7 +355,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 7
@@ -378,7 +378,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 17 - Batch 8
@@ -401,7 +401,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
 
     ######################################################################
@@ -462,7 +462,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -475,7 +474,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
             name: JDK 11 - Batch 2
@@ -487,6 +486,382 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='1' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 11 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='2' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 11 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='3' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 11 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='4' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 11 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='5' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 11 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='6' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 11 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='7' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='0' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='1' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='2' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='3' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='4' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='5' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='6' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: JDK 17 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create \
+                  --start-version='8' \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk17,ubuntu-jdk17' \
+                  --concurrent-builds='1' \
+                  --job-offset='7' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+
+        - step:
+            name: EAP JDK 11 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
+                  --create-eap \
+                  --start-version='7.11' \
+                  --default-release \
+                  --dockerfile='Dockerfile' \
+                  --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='jdk11,ubuntu-jdk11' \
+                  --concurrent-builds='1' \
+                  --job-offset='0' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP JDK 11 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -500,10 +875,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 11 - Batch 3
+            name: EAP JDK 11 - Batch 3
             services:
               - docker
             script:
@@ -511,7 +886,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -525,10 +899,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 11 - Batch 4
+            name: EAP JDK 11 - Batch 4
             services:
               - docker
             script:
@@ -536,7 +910,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -550,10 +923,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 11 - Batch 5
+            name: EAP JDK 11 - Batch 5
             services:
               - docker
             script:
@@ -561,7 +934,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -575,10 +947,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 11 - Batch 6
+            name: EAP JDK 11 - Batch 6
             services:
               - docker
             script:
@@ -586,7 +958,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -600,10 +971,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 11 - Batch 7
+            name: EAP JDK 11 - Batch 7
             services:
               - docker
             script:
@@ -611,7 +982,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -625,10 +995,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 11 - Batch 8
+            name: EAP JDK 11 - Batch 8
             services:
               - docker
             script:
@@ -636,7 +1006,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='7.11' \
                   --default-release \
@@ -650,10 +1019,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 1
+            name: EAP JDK 17 - Batch 1
             services:
               - docker
             script:
@@ -661,7 +1030,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -674,10 +1042,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 2
+            name: EAP JDK 17 - Batch 2
             services:
               - docker
             script:
@@ -685,7 +1053,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -698,10 +1065,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 3
+            name: EAP JDK 17 - Batch 3
             services:
               - docker
             script:
@@ -709,7 +1076,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -722,10 +1088,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 4
+            name: EAP JDK 17 - Batch 4
             services:
               - docker
             script:
@@ -733,7 +1099,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -746,10 +1111,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 5
+            name: EAP JDK 17 - Batch 5
             services:
               - docker
             script:
@@ -757,7 +1122,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -770,10 +1134,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 6
+            name: EAP JDK 17 - Batch 6
             services:
               - docker
             script:
@@ -781,7 +1145,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -794,10 +1157,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 7
+            name: EAP JDK 17 - Batch 7
             services:
               - docker
             script:
@@ -805,7 +1168,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -818,10 +1180,10 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
         - step:
-            name: JDK 17 - Batch 8
+            name: EAP JDK 17 - Batch 8
             services:
               - docker
             script:
@@ -829,7 +1191,6 @@ pipelines:
               - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
               - >
                 python /usr/src/app/make-releases.py \
-                  --create \
                   --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
@@ -842,7 +1203,7 @@ pipelines:
                   --jobs-total='8' \
                   --docker-repos='atlassian/confluence,atlassian/confluence-server' \
                   --push
- 
+
 
     custom-release:
       - variables:

bitbucket-pipelines.yml.j2

@@ -57,7 +57,7 @@ pipelines:
                   --jobs-total='{{ batches }}' \
                   --docker-repos='{{ appdata.docker_repos|join(',') }}' \
                   --push
- 
+
     {% endfor %}
   {% endfor %}
 {% endfor %}
@@ -124,6 +124,41 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
+                  --start-version='{{ appdata.start_version }}' \
+                  {% if appdata.end_version|length %}
+                  --end-version='{{ appdata.end_version }}' \
+                  {% endif %}
+                  {% if appdata.default_release %}
+                  --default-release \
+                  {% endif %}
+                  --dockerfile='{{ appdata.dockerfile }}' \
+                  --dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
+                  --dockerfile-version-arg='CONFLUENCE_VERSION' \
+                  --mac-product-key='confluence' \
+                  --tag-suffixes='{{ appdata.tag_suffixes|join(',') }}' \
+                  --concurrent-builds='1' \
+                  --job-offset='{{ offset }}' \
+                  --jobs-total='{{ batches }}' \
+                  --docker-repos='{{ appdata.docker_repos|join(',') }}' \
+                  --push
+
+    {% endfor %}
+  {% endfor %}
+{% endfor %}
+
+{% for (name, pdata) in images.items() %}
+  {% for (jdkver, appdata) in pdata.items() %}
+    {% for offset in range(0, batches) %}
+
+        - step:
+            name: EAP JDK {{ jdkver }} - Batch {{ offset + 1 }}
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
+              - >
+                python /usr/src/app/make-releases.py \
                   --create-eap \
                   --start-version='{{ appdata.start_version }}' \
                   {% if appdata.end_version|length %}
@@ -142,7 +177,7 @@ pipelines:
                   --jobs-total='{{ batches }}' \
                   --docker-repos='{{ appdata.docker_repos|join(',') }}' \
                   --push
- 
+
     {% endfor %}
   {% endfor %}
 {% endfor %}