Merged in CLIP-1880-stop-building-jdk11-eap (pull request #164)

CLIP-1880: Stop building JDK11 EAP tags

* CLIP-1880: Stop building JDK11 EAP tags


Approved-by: Jun Jeong
Approved-by: Minh Tran
This commit is contained in:
Eugene Ivantsov 2024-05-21 00:34:40 +00:00
parent d5e389ccd6
commit fa7f3f1a20
3 changed files with 10 additions and 72 deletions

View File

@ -40,7 +40,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -66,7 +65,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -92,7 +90,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -118,7 +115,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -144,7 +140,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -170,7 +165,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -196,7 +190,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -222,7 +215,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -247,7 +239,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -272,7 +263,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -297,7 +287,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -322,7 +311,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -347,7 +335,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -372,7 +359,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -397,7 +383,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -422,7 +407,6 @@ pipelines:
--update \ --update \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -846,7 +830,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -870,7 +853,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -894,7 +876,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -918,7 +899,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -942,7 +922,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -966,7 +945,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -990,7 +968,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1014,7 +991,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1116,7 +1092,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1142,7 +1117,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1168,7 +1142,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1194,7 +1167,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1220,7 +1192,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1246,7 +1217,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1272,7 +1242,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1298,7 +1267,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1323,7 +1291,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1348,7 +1315,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1373,7 +1339,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1398,7 +1363,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1423,7 +1387,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1448,7 +1411,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1473,7 +1435,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1498,7 +1459,6 @@ pipelines:
--create \ --create \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1922,7 +1882,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1946,7 +1905,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1970,7 +1928,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -1994,7 +1951,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2018,7 +1974,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2042,7 +1997,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2066,7 +2020,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2090,7 +2043,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2117,7 +2069,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2143,7 +2094,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2169,7 +2119,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2195,7 +2144,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2221,7 +2169,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2247,7 +2194,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2273,7 +2219,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2299,7 +2244,6 @@ pipelines:
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.3' \ --end-version='8.3' \
--default-release \ --default-release \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2324,7 +2268,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2349,7 +2292,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2374,7 +2316,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2399,7 +2340,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2424,7 +2364,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2449,7 +2388,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2474,7 +2412,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2499,7 +2436,6 @@ pipelines:
--create-eap \ --create-eap \
--start-version='8.3' \ --start-version='8.3' \
--end-version='9.0' \ --end-version='9.0' \
--default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2923,7 +2859,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2947,7 +2882,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2971,7 +2905,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -2995,7 +2928,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -3019,7 +2951,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -3043,7 +2974,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -3067,7 +2997,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -3091,7 +3020,6 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='8.5.6' \ --start-version='8.5.6' \
--default-eap \
--dockerfile='Dockerfile.ubi' \ --dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \ --dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \

View File

@ -47,7 +47,9 @@ pipelines:
{% if appdata.default_release %} {% if appdata.default_release %}
--default-release \ --default-release \
{% endif %} {% endif %}
{% if appdata.default_eap %}
--default-eap \ --default-eap \
{% endif %}
--dockerfile='{{ appdata.dockerfile }}' \ --dockerfile='{{ appdata.dockerfile }}' \
--dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \ --dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -159,7 +161,9 @@ pipelines:
{% if appdata.default_release %} {% if appdata.default_release %}
--default-release \ --default-release \
{% endif %} {% endif %}
{% if appdata.default_eap %}
--default-eap \ --default-eap \
{% endif %}
--dockerfile='{{ appdata.dockerfile }}' \ --dockerfile='{{ appdata.dockerfile }}' \
--dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \ --dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
@ -196,7 +200,9 @@ pipelines:
{% if appdata.default_release %} {% if appdata.default_release %}
--default-release \ --default-release \
{% endif %} {% endif %}
{% if appdata.default_eap %}
--default-eap \ --default-eap \
{% endif %}
--dockerfile='{{ appdata.dockerfile }}' \ --dockerfile='{{ appdata.dockerfile }}' \
--dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \ --dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \

View File

@ -12,6 +12,7 @@ images = {
'start_version': '7.19', 'start_version': '7.19',
'end_version': '8.3', 'end_version': '8.3',
'default_release': True, 'default_release': True,
'default_eap': False,
'base_image': 'eclipse-temurin:11', 'base_image': 'eclipse-temurin:11',
'tag_suffixes': ['jdk11','ubuntu-jdk11'], 'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile', 'dockerfile': 'Dockerfile',
@ -21,6 +22,7 @@ images = {
'start_version': '8.3', 'start_version': '8.3',
'end_version': '9.0', 'end_version': '9.0',
'default_release': False, 'default_release': False,
'default_eap': False,
'base_image': 'eclipse-temurin:11', 'base_image': 'eclipse-temurin:11',
'tag_suffixes': ['jdk11','ubuntu-jdk11'], 'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile', 'dockerfile': 'Dockerfile',
@ -30,6 +32,7 @@ images = {
'start_version': '8.0', 'start_version': '8.0',
'end_version': '8.3', 'end_version': '8.3',
'default_release': False, 'default_release': False,
'default_eap': True,
'base_image': 'eclipse-temurin:17', 'base_image': 'eclipse-temurin:17',
'tag_suffixes': ['jdk17','ubuntu-jdk17'], 'tag_suffixes': ['jdk17','ubuntu-jdk17'],
'dockerfile': 'Dockerfile', 'dockerfile': 'Dockerfile',
@ -38,6 +41,7 @@ images = {
"17-default": { "17-default": {
'start_version': '8.3', 'start_version': '8.3',
'default_release': True, 'default_release': True,
'default_eap': True,
'base_image': 'eclipse-temurin:17', 'base_image': 'eclipse-temurin:17',
'tag_suffixes': ['jdk17','ubuntu-jdk17'], 'tag_suffixes': ['jdk17','ubuntu-jdk17'],
'dockerfile': 'Dockerfile', 'dockerfile': 'Dockerfile',