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 use-latest-confluence-func-tests (pull request #177)

Browse Source 
Use the latest Confluence for func tests

* Use the latest Confluence for func tests


Approved-by: Yifei Zhang
This commit is contained in:
Eugene Ivantsov 2024-08-07 01:46:56 +00:00
parent f06258364b
commit 0bab37a331
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitbucket-pipelines.yml
View File

@ -1196,7 +1196,6 @@ 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'
- export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
- py.test -v tests/ - py.test -v tests/
- py.test -v shared-components/tests/ - py.test -v shared-components/tests/
@ -1213,7 +1212,6 @@ pipelines:
- export DOCKERFILE='Dockerfile.ubi' - export DOCKERFILE='Dockerfile.ubi'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence' - export MAC_PRODUCT_KEY='confluence'
- export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
- py.test -v tests/ - py.test -v tests/
- step: - step:
@ -1224,7 +1222,6 @@ pipelines:
- apk add --no-cache git docker-compose jq curl - apk add --no-cache git docker-compose jq curl
- git submodule update --init --recursive - git submodule update --init --recursive
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
- export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
- 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/post_build.sh test-image $IS_RELEASE - /usr/src/app/post_build.sh test-image $IS_RELEASE
@ -1237,7 +1234,6 @@ pipelines:
- apk add --no-cache git docker-compose jq curl - apk add --no-cache git docker-compose jq curl
- git submodule update --init --recursive - git submodule update --init --recursive
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
- export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
- docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi
- export IS_RELEASE=false - export IS_RELEASE=false
- export SEV_THRESHOLD=critical - export SEV_THRESHOLD=critical

4
bitbucket-pipelines.yml.j2
View File

@ -97,7 +97,6 @@ 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'
- export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
- py.test -v tests/ - py.test -v tests/
- py.test -v shared-components/tests/ - py.test -v shared-components/tests/
@ -114,7 +113,6 @@ pipelines:
- export DOCKERFILE='Dockerfile.ubi' - export DOCKERFILE='Dockerfile.ubi'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence' - export MAC_PRODUCT_KEY='confluence'
- export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
- py.test -v tests/ - py.test -v tests/
- step: - step:
@ -125,7 +123,6 @@ pipelines:
- apk add --no-cache git docker-compose jq curl - apk add --no-cache git docker-compose jq curl
- git submodule update --init --recursive - git submodule update --init --recursive
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
- export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
- 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/post_build.sh test-image $IS_RELEASE - /usr/src/app/post_build.sh test-image $IS_RELEASE
@ -138,7 +135,6 @@ pipelines:
- apk add --no-cache git docker-compose jq curl - apk add --no-cache git docker-compose jq curl
- git submodule update --init --recursive - git submodule update --init --recursive
- export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
- export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
- docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi
- export IS_RELEASE=false - export IS_RELEASE=false
- export SEV_THRESHOLD=critical - export SEV_THRESHOLD=critical