From f165fd0f5822aed7d9a6615edd1a074ee92f76d8 Mon Sep 17 00:00:00 2001
From: Dave Chevell <dchevell@atlassian.com>
Date: Wed, 20 Nov 2019 21:32:32 +1100
Subject: [PATCH] Update pipelines with git submodule support & new test
 configuration

---
 README.md               |  7 +++++++
 bitbucket-pipelines.yml | 23 +++++++++++++++++++++--
 shared-components       |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7c87a8c..bbdea5f 100644
--- a/README.md
+++ b/README.md
@@ -255,6 +255,13 @@ management technology, and is beyond the scope of this documentation.
 
    The multicast address the cluster will communicate on.
 
+## Container Configuration
+
+* `SET_PERMISSIONS` (default: true)
+
+   Define whether to set home directory permissions on startup. Set to `false` to disable
+   this behaviour.
+
 ## Advanced Configuration
 
 As mentioned at the top of this section, the settings from the environment are
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index d3576e1..d7b5524 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -8,6 +8,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - export START_VERSION='6'
             - export END_VERSION='7'
             - export DEFAULT_RELEASE='false'
@@ -24,6 +25,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - export START_VERSION='6'
             - export END_VERSION='7.1'
             - export DEFAULT_RELEASE='true'
@@ -40,6 +42,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - export START_VERSION='7.1'
             - export END_VERSION='8'
             - export DEFAULT_RELEASE='true'
@@ -58,6 +61,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
             - >
               docker build -t atlassian/confluence-server:${DOCKER_TAG}
@@ -70,6 +74,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - export START_VERSION='6'
             - export END_VERSION='7'
             - export DEFAULT_RELEASE='false'
@@ -86,6 +91,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - export START_VERSION='6'
             - export END_VERSION='7.1'
             - export DEFAULT_RELEASE='true'
@@ -102,6 +108,7 @@ pipelines:
           services:
             - docker
           script:
+            - git submodule update --init --recursive
             - export START_VERSION='7.1'
             - export END_VERSION='8'
             - export DEFAULT_RELEASE='true'
@@ -116,9 +123,11 @@ pipelines:
           name: Update README
           image: python:3.7-alpine3.9
           script:
+            - apk add --no-cache git
+            - git submodule update --init --recursive
             - pip install -q requests
             - export DOCKER_REPO='atlassian/confluence-server'
-            - python bin/push-readme.py
+            - python shared-components/image/push-readme.py
   pull-requests:
     '**':
       - step:
@@ -126,8 +135,18 @@ pipelines:
           services:
             - docker
           script:
-            - pip install -q -r tests/test-requirements.txt
+            - 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 tests/
+            - py.test shared-components/tests/
+            - export DOCKERFILE='Dockerfile-alpine'
+            - py.test tests/
+            - py.test shared-components/tests/
 definitions:
   services:
     docker:
diff --git a/shared-components b/shared-components
index 30c9a5a..eb1df51 160000
--- a/shared-components
+++ b/shared-components
@@ -1 +1 @@
-Subproject commit 30c9a5a1ca25ad8fcd3057481694b335fbf92370
+Subproject commit eb1df51c88ee99c38ce276f85981c07c23319e1d