Merged in CLIP-1725-confluence-8-db-upgrade (pull request #127)

CLIP-1725: Func-test DB upgrade to support upgrades to Confluence 8

Approved-by: Eugene Ivantsov
Approved-by: Adam Brokes

bitbucket-pipelines.yml

@@ -37,7 +37,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -61,7 +61,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -85,7 +85,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -109,7 +109,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -133,7 +133,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -157,7 +157,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -181,7 +181,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -205,7 +205,7 @@ pipelines:
               - >
                 python  /usr/src/app/make-releases.py \
                   --update \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -463,7 +463,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -488,7 +488,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -513,7 +513,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -538,7 +538,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -563,7 +563,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -588,7 +588,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -613,7 +613,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
@@ -638,7 +638,7 @@ pipelines:
                 python /usr/src/app/make-releases.py \
                   --create \
                   --create-eap \
-                  --start-version='7.4' \
+                  --start-version='7.11' \
                   --default-release \
                   --dockerfile='Dockerfile' \
                   --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \

func-tests/README.md

@@ -1,5 +1,28 @@
 
 # Test data
 
-The database dump and `confluence.cfg.xml.tmpl` are dumped from a 6.0.1
+The database dump and `confluence.cfg.xml.tmpl` are dumped from a 7.11.6
 instance.
+
+## Updating the test data
+
+Periodically Confluence will move forward far enough that it is unable to
+upgrade databases from older unsupported versions. In this case you will need to
+upgrade the database to the oldest supported version and re-dump the DB. Steps
+to do this are:
+
+* Generate a local Confluence image of the oldest supported version (see
+  [Atlassian Support End of Life Policy](https://confluence.atlassian.com/support/atlassian-support-end-of-life-policy-201851003.html).
+* Run the func-tests up to the start of the smoke-tests (these won't start by
+  default if `CONFLUENCE_ADMIN_PWD` is not set.
+* Stop the func-tests after the DB upgrade has run, then start the Postgres
+  instance (`docker-compose up postgres`).
+* `exec` into the running postgres container and dump the DB with `pg_dump -U confluence confuence > confluence.sql`
+* Copy the dump to `func-tests/postgres` and update the Dockerfile, scripts,
+  etc.
+
+You may find that Confluence will fail to start with a `500` error after; this
+may be due to an incompatible version in
+`func-tests/confluence/confluence-home/confluence.cfg.xml.tmpl`. You can
+retrieve the correct version from the error-message in the startup logs on the
+image and update the file.

func-tests/confluence/confluence-home/confluence.cfg.xml.tmpl

@@ -3,7 +3,7 @@
 <confluence-configuration>
   <setupStep>complete</setupStep>
   <setupType>custom</setupType>
-  <buildNumber>7101</buildNumber>
+  <buildNumber>8701</buildNumber>
   <properties>
     <property name="admin.ui.allow.daily.backup.custom.location">false</property>
     <property name="admin.ui.allow.manual.backup.download">false</property>

func-tests/postgres/Dockerfile

@@ -1,3 +1,3 @@
 FROM postgres:10.16-alpine
 
-COPY  confluence-6.0.1.sql /docker-entrypoint-initdb.d/confluence.sql
+COPY  confluence-7.11.6.sql /docker-entrypoint-initdb.d/confluence.sql

pipelines-generator.py

@@ -9,7 +9,7 @@ REPOS = ['atlassian/confluence', 'atlassian/confluence-server']
 images = {
     'Confluence': {
         11: {
-            'start_version': '7.4',
+            'start_version': '7.11',
             'default_release': True,
             'base_image': 'eclipse-temurin:11',
             'tag_suffixes': ['jdk11','ubuntu-jdk11'],