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

bitbucket-pipelines.yml

@@ -462,7 +462,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -487,7 +486,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -512,7 +510,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -537,7 +534,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -562,7 +558,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -587,7 +582,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -612,7 +606,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -637,7 +630,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
@@ -662,7 +654,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -686,7 +677,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -710,7 +700,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -734,7 +723,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -758,7 +746,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -782,7 +769,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -806,7 +792,6 @@ pipelines:
               - >
                 python /usr/src/app/make-releases.py \
                   --create \
-                  --create-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
@@ -830,6 +815,382 @@ pipelines:
               - >
                 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 \
+                  --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: EAP 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-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='2' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP 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-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='3' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP 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-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='4' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP 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-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='5' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP 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-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='6' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP 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-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='7' \
+                  --jobs-total='8' \
+                  --docker-repos='atlassian/confluence,atlassian/confluence-server' \
+                  --push
+
+
+        - step:
+            name: EAP 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-eap \
+                  --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: EAP 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-eap \
+                  --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: EAP 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-eap \
+                  --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: EAP 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-eap \
+                  --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: EAP 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-eap \
+                  --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: EAP 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-eap \
+                  --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: EAP 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-eap \
+                  --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: EAP 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-eap \
                   --start-version='8' \
                   --dockerfile='Dockerfile' \

bitbucket-pipelines.yml.j2

@@ -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 %}