2021-03-23 04:43:13 +00:00
|
|
|
---
|
|
|
|
# NOTE: This file is generated from `bitbucket-pipelines.yml.j2` via `pipelines-generator.py`:
|
|
|
|
#
|
|
|
|
# python3 pipelines-generator.py > bitbucket-pipelines.yml
|
|
|
|
|
2019-05-16 05:51:31 +00:00
|
|
|
image: atlassian/docker-release-maker:latest
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
definitions:
|
|
|
|
services:
|
|
|
|
docker:
|
|
|
|
memory: 4096
|
|
|
|
|
|
|
|
options:
|
|
|
|
size: 2x
|
2017-10-10 02:24:57 +00:00
|
|
|
|
|
|
|
pipelines:
|
2021-03-23 04:43:13 +00:00
|
|
|
|
|
|
|
branches:
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
######################################################################
|
2021-03-23 04:43:13 +00:00
|
|
|
# Master branch: Do full release for each image flavour
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
######################################################################
|
2021-03-23 04:43:13 +00:00
|
|
|
master:
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
- step:
|
2021-03-23 04:43:13 +00:00
|
|
|
name: Check if pipelines config is up-to-date...
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
script:
|
2021-03-23 04:43:13 +00:00
|
|
|
- python3 pipelines-generator.py > bitbucket-piplines.yml.expected && diff bitbucket-pipelines.yml bitbucket-piplines.yml.expected
|
|
|
|
|
|
|
|
- parallel:
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 1
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='0' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 2
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='1' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 3
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='2' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 4
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='3' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 5
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='4' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 6
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='5' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 7
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='6' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 8
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='7' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 9
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='8' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 10
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='9' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 11
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='10' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 12
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--update \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='11' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
- step:
|
2021-03-23 04:43:13 +00:00
|
|
|
name: Update README
|
|
|
|
image: python:3.7-alpine3.9
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
script:
|
2021-03-23 04:43:13 +00:00
|
|
|
- apk add --no-cache git
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
- git submodule update --init --recursive
|
2021-03-23 04:43:13 +00:00
|
|
|
- pip install -q requests
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
- export DOCKER_REPO='atlassian/confluence-server'
|
2021-03-23 04:43:13 +00:00
|
|
|
- python shared-components/image/push-readme.py
|
2021-09-03 00:10:48 +00:00
|
|
|
- export DOCKER_REPO='atlassian/confluence'
|
|
|
|
- python shared-components/image/push-readme.py
|
2021-03-23 04:43:13 +00:00
|
|
|
|
2021-07-15 00:00:29 +00:00
|
|
|
|
|
|
|
######################################################################
|
|
|
|
# All other branches & PRs; run unit tests & functional tests
|
|
|
|
# against latest app version
|
|
|
|
######################################################################
|
|
|
|
'**':
|
|
|
|
- step:
|
2021-07-15 00:04:10 +00:00
|
|
|
name: Check if pipelines config is up-to-date...
|
2021-07-15 00:00:29 +00:00
|
|
|
script:
|
2021-07-15 00:04:10 +00:00
|
|
|
- python3 pipelines-generator.py > bitbucket-piplines.yml.expected && diff bitbucket-pipelines.yml bitbucket-piplines.yml.expected
|
|
|
|
|
|
|
|
- parallel:
|
|
|
|
- step:
|
|
|
|
name: Run unit tests
|
|
|
|
image: python:3.7-alpine3.9
|
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- apk add --no-cache git
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- pip install -q -r shared-components/tests/requirements.txt
|
|
|
|
- export PYTHONPATH=./shared-components/tests:$PYTHONPATH
|
|
|
|
- export DOCKERFILE='Dockerfile'
|
|
|
|
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
|
|
|
|
- export MAC_PRODUCT_KEY='confluence'
|
|
|
|
- py.test -v tests/
|
|
|
|
- py.test -v shared-components/tests/
|
|
|
|
|
|
|
|
- step:
|
|
|
|
name: Run integration tests
|
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- apk add --no-cache git docker-compose jq curl
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions/latest | jq -r .name`
|
|
|
|
- docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
|
|
|
|
- export IS_RELEASE=false
|
|
|
|
- /usr/src/app/post_build.sh test-image $IS_RELEASE
|
2021-07-15 00:00:29 +00:00
|
|
|
|
2021-03-23 04:43:13 +00:00
|
|
|
custom:
|
|
|
|
######################################################################
|
|
|
|
# Custom: Do full release for each image flavour
|
|
|
|
######################################################################
|
|
|
|
new-releases:
|
|
|
|
|
|
|
|
- parallel:
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 1
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='0' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 2
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='1' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 3
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='2' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 4
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='3' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 5
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='4' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 6
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='5' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 7
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='6' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 8
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='7' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 9
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='8' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 10
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='9' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 11
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='10' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
|
|
|
- step:
|
2021-07-14 01:23:53 +00:00
|
|
|
name: JDK 11 - Batch 12
|
2021-03-23 04:43:13 +00:00
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-03-29 03:25:28 +00:00
|
|
|
python /usr/src/app/make-releases.py \
|
|
|
|
--create \
|
2021-04-20 02:46:35 +00:00
|
|
|
--create-eap \
|
2022-03-08 06:14:56 +00:00
|
|
|
--start-version='7.4' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--end-version='8' \
|
|
|
|
--default-release \
|
2021-03-29 04:29:57 +00:00
|
|
|
--dockerfile='Dockerfile' \
|
2021-09-16 04:11:45 +00:00
|
|
|
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--dockerfile-version-arg='CONFLUENCE_VERSION' \
|
|
|
|
--mac-product-key='confluence' \
|
2021-03-29 06:21:24 +00:00
|
|
|
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
|
2021-03-29 03:25:28 +00:00
|
|
|
--concurrent-builds='1' \
|
|
|
|
--job-offset='11' \
|
|
|
|
--jobs-total='12' \
|
2021-03-29 04:29:57 +00:00
|
|
|
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
|
2021-03-23 04:43:13 +00:00
|
|
|
--push
|
|
|
|
|
|
|
|
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
custom-release:
|
|
|
|
- variables:
|
|
|
|
- name: CONFLUENCE_VERSION
|
|
|
|
- name: DOCKER_TAG
|
|
|
|
- step:
|
|
|
|
services:
|
|
|
|
- docker
|
|
|
|
script:
|
|
|
|
- git submodule update --init --recursive
|
|
|
|
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
|
|
- >
|
2021-09-03 00:10:48 +00:00
|
|
|
docker build -t atlassian/confluence:${DOCKER_TAG}
|
Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.
KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space
KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout
KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points
KUBEDCKUBE-138:
Added development document
Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
|
|
|
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
|
2021-09-02 09:58:54 +00:00
|
|
|
- snyk auth $SNYK_TOKEN
|
2021-09-03 00:10:48 +00:00
|
|
|
- snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
|
|
|
|
- docker push atlassian/confluence:${DOCKER_TAG}
|