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 fix-integration-test (pull request #91)

Browse Source 
Reference new integration test script.

Approved-by: Adam Brokes
This commit is contained in:
Steve Smith 2021-04-14 06:08:11 +00:00
commit b8df54a5cb
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bitbucket-pipelines.yml
View File

@ -1847,6 +1847,7 @@ pipelines:
###################################################################### ######################################################################
'**': '**':
- step: - step:
name: Run unit tests
image: python:3.7-alpine3.9 image: python:3.7-alpine3.9
services: services:
- docker - docker
@ -1858,12 +1859,13 @@ pipelines:
- export DOCKERFILE='Dockerfile' - export DOCKERFILE='Dockerfile'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence' - export MAC_PRODUCT_KEY='confluence'
- py.test tests/ - py.test -v tests/
- py.test shared-components/tests/ - py.test -v shared-components/tests/
- export DOCKERFILE='Dockerfile-alpine' - export DOCKERFILE='Dockerfile-alpine'
- py.test tests/ - py.test -v tests/
- py.test shared-components/tests/ - py.test -v shared-components/tests/
- step: - step:
name: Run integration tests
services: services:
- docker - docker
script: script:
@ -1872,5 +1874,5 @@ pipelines:
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions/latest | jq -r .name` - 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 . - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
- export IS_RELEASE=false - export IS_RELEASE=false
- /usr/src/app/integration_test.sh test-image $IS_RELEASE - /usr/src/app/post_build.sh test-image $IS_RELEASE

12
bitbucket-pipelines.yml.j2
View File

@ -137,6 +137,7 @@ pipelines:
###################################################################### ######################################################################
'**': '**':
- step: - step:
name: Run unit tests
image: python:3.7-alpine3.9 image: python:3.7-alpine3.9
services: services:
- docker - docker
@ -148,12 +149,13 @@ pipelines:
- export DOCKERFILE='Dockerfile' - export DOCKERFILE='Dockerfile'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence' - export MAC_PRODUCT_KEY='confluence'
- py.test tests/ - py.test -v tests/
- py.test shared-components/tests/ - py.test -v shared-components/tests/
- export DOCKERFILE='Dockerfile-alpine' - export DOCKERFILE='Dockerfile-alpine'
- py.test tests/ - py.test -v tests/
- py.test shared-components/tests/ - py.test -v shared-components/tests/
- step: - step:
name: Run integration tests
services: services:
- docker - docker
script: script:
@ -162,5 +164,5 @@ pipelines:
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions/latest | jq -r .name` - 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 . - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
- export IS_RELEASE=false - export IS_RELEASE=false
- /usr/src/app/integration_test.sh test-image $IS_RELEASE - /usr/src/app/post_build.sh test-image $IS_RELEASE

13
tests/test_image.py
View File

@ -330,19 +330,6 @@ def test_non_root_user(docker_cli, image):
_jvm = wait_for_proc(container, get_bootstrap_proc(container)) _jvm = wait_for_proc(container, get_bootstrap_proc(container))
def test_jvm_support_recommended_args_order(docker_cli, image):
ENABLE_PRINTGCDETAILS = '-XX:+PrintGCDetails'
DISABLE_PRINTGCDETAILS = '-XX:-PrintGCDetails'
environment = {
'JVM_SUPPORT_RECOMMENDED_ARGS': ENABLE_PRINTGCDETAILS,
}
container = run_image(docker_cli, image, environment=environment)
_jvm = wait_for_proc(container, get_bootstrap_proc(container))
procs_list = get_procs(container)
jvm = [proc for proc in procs_list if get_bootstrap_proc(container) in proc][0]
assert jvm.index(ENABLE_PRINTGCDETAILS) > jvm.index(DISABLE_PRINTGCDETAILS)
def test_jvm_fallback_fonts(docker_cli, image): def test_jvm_fallback_fonts(docker_cli, image):
container = run_image(docker_cli, image) container = run_image(docker_cli, image)
_jvm = wait_for_proc(container, get_bootstrap_proc(container)) _jvm = wait_for_proc(container, get_bootstrap_proc(container))