Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in DCD-1313-remove-soon-eoled-builds (pull request #101)

Browse Source 
Remove soon-to-be-EOLed JDK8 builds that are incompatible with the DC test license.

Approved-by: Adam Brokes
This commit is contained in:
Steve Smith 2021-07-16 05:29:39 +00:00
commit 09d6c2e5f2
3 changed files with 132 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

783
bitbucket-pipelines.yml
View File

File diff suppressed because it is too large Load Diff

79
bitbucket-pipelines.yml.j2
View File

@ -31,7 +31,7 @@ pipelines:
{% for offset in range(0, batches) %}
- step:
name: {{ name }} JDK {{ jdkver }} - Batch {{ offset + 1 }}
name: JDK {{ jdkver }} - Batch {{ offset + 1 }}
services:
- docker
script:
@ -70,6 +70,46 @@ pipelines:
- export DOCKER_REPO='atlassian/confluence-server'
- python shared-components/image/push-readme.py
######################################################################
# All other branches & PRs; run unit tests & functional tests
# against latest app version
######################################################################
'**':
- step:
name: Check if pipelines config is up-to-date...
script:
- 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
custom:
######################################################################
# Custom: Do full release for each image flavour
@ -83,7 +123,7 @@ pipelines:
{% for offset in range(0, batches) %}
- step:
name: {{ name }} JDK {{ jdkver }} - Batch {{ offset + 1 }}
name: JDK {{ jdkver }} - Batch {{ offset + 1 }}
services:
- docker
script:
@ -129,38 +169,3 @@ pipelines:
- snyk auth @SNYK_TOKEN
- snyk container test atlassian/confluence-server:${DOCKER_TAG} --severity-threshold=high
- docker push atlassian/confluence-server:${DOCKER_TAG}
pull-requests:
######################################################################
# All other branches & PRs; run unit tests & functional tests
# against latest app version
######################################################################
'**':
- 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

13
pipelines-generator.py
View File

@ -7,18 +7,9 @@ TEMPLATE_FILE = 'bitbucket-pipelines.yml.j2'
REPOS = ['atlassian/confluence', 'atlassian/confluence-server']
images = {
'Confluence Ubuntu': {
8: {
'start_version': '6',
'end_version': '7.1',
'default_release': True,
'base_image': 'adoptopenjdk:8-hotspot',
'tag_suffixes': ['adoptopenjdk8', 'jdk8', 'ubuntu', 'ubuntu-18.04-adoptopenjdk8'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
},
'Confluence': {
11: {
'start_version': '7.1',
'start_version': '7.2',
'end_version': '8',
'default_release': True,
'base_image': 'adoptopenjdk:11-hotspot',