mirror of
https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git
synced 2024-08-30 18:22:16 +00:00
Reduced the number of pipeline batches to 8
This commit is contained in:
parent
047afb86b2
commit
96f863bd95
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user