From 96f863bd9542c879273b91af947c395f63db0a1f Mon Sep 17 00:00:00 2001 From: nghazalibeiklar Date: Wed, 16 Mar 2022 14:41:23 +1100 Subject: [PATCH] Reduced the number of pipeline batches to 8 --- bitbucket-pipelines.yml | 236 +++------------------------------------- pipelines-generator.py | 2 +- 2 files changed, 17 insertions(+), 221 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index e04e067..352f5bd 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -47,7 +47,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='0' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -72,7 +72,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='1' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -97,7 +97,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='2' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -122,7 +122,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='3' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -147,7 +147,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='4' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -172,7 +172,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='5' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -197,7 +197,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='6' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -222,107 +222,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='7' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 9 - 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 \ - --update \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='8' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 10 - 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 \ - --update \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='9' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 11 - 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 \ - --update \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='10' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 12 - 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 \ - --update \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='11' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -397,7 +297,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='0' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -423,7 +323,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='1' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -449,7 +349,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='2' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -475,7 +375,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='3' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -501,7 +401,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='4' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -527,7 +427,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='5' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -553,7 +453,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='6' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push @@ -579,111 +479,7 @@ pipelines: --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --concurrent-builds='1' \ --job-offset='7' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 9 - 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 \ - --create-eap \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='8' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 10 - 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 \ - --create-eap \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='9' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 11 - 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 \ - --create-eap \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='10' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: JDK 11 - Batch 12 - 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 \ - --create-eap \ - --start-version='7.4' \ - --end-version='8' \ - --default-release \ - --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ - --concurrent-builds='1' \ - --job-offset='11' \ - --jobs-total='12' \ + --jobs-total='8' \ --docker-repos='atlassian/confluence,atlassian/confluence-server' \ --push diff --git a/pipelines-generator.py b/pipelines-generator.py index f6bf6e4..613ac77 100755 --- a/pipelines-generator.py +++ b/pipelines-generator.py @@ -27,7 +27,7 @@ def main(): lstrip_blocks=True, trim_blocks=True) template = jenv.get_template(TEMPLATE_FILE) - generated_output = template.render(images=images, batches=12) + generated_output = template.render(images=images, batches=8) print(generated_output)