DCD-1313: Move test data out of zipfile and cleanup.

func-tests/confluence/.gitignore

@@ -0,0 +1,2 @@
+confluence-home/confluence.cfg.xml
+Dockerfile

func-tests/confluence/README.md

@@ -0,0 +1,4 @@
+
+# Test data
+
+`confluence-home` is a dump from 6.0.1.

func-tests/confluence/confluence-home/.cache/fontconfig/CACHEDIR.TAG

@@ -0,0 +1,4 @@
+Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by fontconfig.
+# For information about cache directory tags, see:
+#       http://www.brynosaurus.com/cachedir/

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<confluence-configuration>
+  <setupStep>complete</setupStep>
+  <setupType>custom</setupType>
+  <buildNumber>7101</buildNumber>
+  <properties>
+    <property name="admin.ui.allow.daily.backup.custom.location">false</property>
+    <property name="admin.ui.allow.manual.backup.download">false</property>
+    <property name="admin.ui.allow.site.support.email">false</property>
+    <property name="atlassian.license.message">INJECT_LICENSE_HERE</property>
+    <property name="attachments.dir">${confluenceHome}/attachments</property>
+    <property name="confluence.database.connection.type">database-type-standard</property>
+    <property name="confluence.setup.server.id">BUCZ-PDGX-RIGQ-YC69</property>
+    <property name="confluence.webapp.context.path">/confluence</property>
+    <property name="hibernate.c3p0.acquire_increment">1</property>
+    <property name="hibernate.c3p0.idle_test_period">100</property>
+    <property name="hibernate.c3p0.max_size">125</property>
+    <property name="hibernate.c3p0.max_statements">0</property>
+    <property name="hibernate.c3p0.min_size">20</property>
+    <property name="hibernate.c3p0.timeout">30</property>
+    <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
+    <property name="hibernate.connection.isolation">2</property>
+    <property name="hibernate.connection.password">confluence</property>
+    <property name="hibernate.connection.url">jdbc:postgresql://postgresql/confluence</property>
+    <property name="hibernate.connection.username">confluence</property>
+    <property name="hibernate.database.lower_non_ascii_supported">false</property>
+    <property name="hibernate.dialect">net.sf.hibernate.dialect.PostgreSQLDialect</property>
+    <property name="hibernate.schema_management_tool">com.atlassian.confluence.impl.hibernate.ConfluenceHibernateSchemaManagementTool</property>
+    <property name="hibernate.setup">true</property>
+    <property name="jwt.private.key">MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALyN3UNhFebLbp1NdY0UBd9kp5UhRVForc6CQ6PiV0k8a5PmK55vO4jrGy30RP0GfrqFwVJ+9oN7Y/xgrNkpefwLxsHee0baMrAkZkTYaDfpjoW4S8NXGM6qkkCtN123tAoCPFitd3MPdf2EzeJQSmXfG9tOgPDrMgBpNoXLhBK1AgMBAAECgYACaHlr8+B4ux5liei3bYsJqFpvkCY3fPPDUGyWujxNJiVllSn3cwo6nG4Tbyw2Yw/ZR/4JFLAHS9siDQYIG/x/0vP3QCcS6v2G5W3iPTy+iNe8FNN+VKvCclS6wUbtE1hg15+8NHfYTvOGSSXeSKHB7JMiQadR2F6x25EGy8LJPQJBAOfGEXk7x+RDGIVKCcOY5cZRxmmEumomV5e89V/IPWCWNtUjl8UM/p58jJH21vv5nZPw9QGaYFVF9kSvadzgg7cCQQDQQ02Rf2Xcaff6oMRfcX5OlhR4MqXHTKf7iM3mdXEAug8fdmWzfN/bxMMEiE7FKcTT3eA/kpuw+lhciNVYSVTzAkBA/aher2Ww2yOgFI/CWjhsMPgLFJ3VMCU1tlWz4wla8SQ1BgMDzU4EkPY149qK04bdOh7psSk8IB8bSXjM5+PnAkBRhEZ0UN1Z7NB3dT3n7dB2ih/w/EIPRF3sApw1PHrCwhDxS7J7EsG8j8OVnpTWb4bvNsVznLr8BsFXVufK6skpAkA4JbeUMocpucpwsX6OJ38uA+NDSmHGKKSw5E9N+QZ0o22vn5JDWcoH8xWtSlAbzfE6VaWf8i+w8EH0FKUlh9P6</property>
+    <property name="jwt.public.key">MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8jd1DYRXmy26dTXWNFAXfZKeVIUVRaK3OgkOj4ldJPGuT5iuebzuI6xst9ET9Bn66hcFSfvaDe2P8YKzZKXn8C8bB3ntG2jKwJGZE2Gg36Y6FuEvDVxjOqpJArTddt7QKAjxYrXdzD3X9hM3iUEpl3xvbToDw6zIAaTaFy4QStQIDAQAB</property>
+    <property name="lucene.index.dir">${localHome}/index</property>
+    <property name="synchrony.btf">true</property>
+    <property name="synchrony.encryption.disabled">true</property>
+    <property name="synchrony.proxy.enabled">true</property>
+    <property name="webwork.multipart.saveDir">${localHome}/temp</property>
+  </properties>
+</confluence-configuration>

func-tests/confluence/confluence-home/journal/main_index

@@ -0,0 +1 @@
+6

func-tests/confluence/confluence-home/shared-home/config/cache-settings-overrides.properties

@@ -0,0 +1,2 @@
+#EhCache Config Settings
+#Wed Mar 10 06:58:23 GMT 2021

func-tests/confluence/confluence-home/shared-home/confluence-healthcheck-eol.json

@@ -0,0 +1 @@
+{"versions":[{"name":"5.9","releaseDate":"2015-11-24"},{"name":"6.8","releaseDate":"2018-03-19"},{"name":"6.12","releaseDate":"2018-09-28"},{"name":"7.7","releaseDate":"2020-08-18"},{"name":"6.9","releaseDate":"2018-05-07"},{"name":"6.11","releaseDate":"2018-08-13"},{"name":"7.8","releaseDate":"2020-09-29"},{"name":"6.14","releaseDate":"2019-01-21"},{"name":"7.9","releaseDate":"2020-11-09"},{"name":"6.13","releaseDate":"2018-12-03"},{"name":"6.15","releaseDate":"2019-03-14"},{"name":"6.10","releaseDate":"2018-06-25"},{"name":"5.10","releaseDate":"2016-06-09"},{"name":"7.11","releaseDate":"2021-02-02"},{"name":"7.10","releaseDate":"2020-12-15"},{"name":"6.0","releaseDate":"2016-10-31"},{"name":"6.1","releaseDate":"2017-03-16"},{"name":"7.0","releaseDate":"2019-09-05"},{"name":"6.2","releaseDate":"2017-05-12"},{"name":"7.1","releaseDate":"2019-11-02"},{"name":"6.3","releaseDate":"2017-07-06"},{"name":"7.2","releaseDate":"2019-12-11"},{"name":"6.4","releaseDate":"2017-09-05"},{"name":"7.3","releaseDate":"2020-02-04"},{"name":"6.5","releaseDate":"2017-11-01"},{"name":"7.4","releaseDate":"2020-04-19"},{"name":"6.6","releaseDate":"2017-12-11"},{"name":"7.5","releaseDate":"2020-05-20"},{"name":"5.8","releaseDate":"2015-06-02"},{"name":"6.7","releaseDate":"2018-01-29"},{"name":"7.6","releaseDate":"2020-06-30"}]}

func-tests/run-functests

@@ -15,7 +15,6 @@ if [ -z "$CONFLUENCE_TEST_LICENSE" ]; then
     exit 1
 fi
 
-unzip -o confluence-home-6.0.1.zip -d confluence
 # NOTE: This expects the license to have been injected
 sh ./confluence/inject-license