XENOPS-1128 add check for content stora fetching file to health check

integration-tests/alfresco-community-61/overload.gradle

@@ -1,6 +1,6 @@
 ext {
     alfrescoBaseWar = 'org.alfresco:content-services-community:6.1.2-ga@war'
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:6.1.2-ga'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:6.1'
 
     postgresImage = 'postgres:10.1'
 }

integration-tests/alfresco-community-62/overload.gradle

@@ -1,6 +1,6 @@
 ext {
     alfrescoBaseWar = 'org.alfresco:content-services-community:6.2.0-ga@war'
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:6.2.0-ga'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:6.2'
 
     postgresImage = 'postgres:10.1'
 }

integration-tests/alfresco-community-70/overload.gradle

@@ -2,7 +2,7 @@ ext {
     alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.0.0'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
 
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.0.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.0'
 
     postgresImage = 'postgres:13.1'
 }

integration-tests/alfresco-community-71/overload.gradle

@@ -2,7 +2,7 @@ ext {
     alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.1.1'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
 
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.1.1'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.1'
 
     postgresImage = 'postgres:13'
 }

integration-tests/alfresco-community-72/overload.gradle

@@ -1,8 +1,8 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.2.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.2.1'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
 
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.2.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.2'
 
     postgresImage = 'postgres:13'
 }

integration-tests/alfresco-community-73/overload.gradle

@@ -2,7 +2,7 @@ ext {
     alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.3.0'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
 
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.3.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.3'
 
     postgresImage = 'postgres:13'
 }

integration-tests/alfresco-community-74/overload.gradle

@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.4.0.1'
+    alfrescoBaseWar = 'org.alfresco:content-services-community@war'
+
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.4'
+
+    postgresImage = 'postgres:13'
+}

integration-tests/alfresco-enterprise-61/overload.gradle

@@ -1,7 +1,7 @@
 ext {
     alfrescoBaseWarBom = 'org.alfresco:acs-packaging:6.1.1.11'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
-    alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:6.1.1'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:6.1'
 
     postgresImage = 'postgres:10.1'
 }

integration-tests/alfresco-enterprise-62/overload.gradle

@@ -1,7 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:6.2.2.19'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:6.2.2.25'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
-    alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:6.2.2.19'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:6.2'
 
     postgresImage = 'postgres:10.1'
 }

integration-tests/alfresco-enterprise-70/overload.gradle

@@ -1,8 +1,8 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.0.1.3'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.0.1.9'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
 
-    alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.0.1.3'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.0'
 
     postgresImage = 'postgres:13.1'
 }

integration-tests/alfresco-enterprise-71/overload.gradle

@@ -1,8 +1,8 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.1.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.1.0.6'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
 
-    alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.1.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.1'
 
     postgresImage = 'postgres:13'
 }

integration-tests/alfresco-enterprise-72/overload.gradle

@@ -1,8 +1,8 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.1.13'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
 
-    alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.2.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.2'
 
     postgresImage = 'postgres:13'
 }

integration-tests/alfresco-enterprise-73/overload.gradle

@@ -1,8 +1,8 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.1.2'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
 
-    alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.3.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.3'
 
     postgresImage = 'postgres:13'
 }

integration-tests/alfresco-enterprise-74/overload.gradle

@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.1.3'
+    alfrescoBaseWar = 'org.alfresco:content-services@war'
+
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.4'
+
+    postgresImage = 'postgres:13'
+}

integration-tests/build.gradle

@@ -38,6 +38,8 @@ test {
 
 subprojects {
     apply plugin: 'java'
+    apply plugin: 'eu.xenit.docker-alfresco'
+    apply plugin: 'eu.xenit.docker-compose.auto'
 
     def alfrescoVersion = project.name[-2..-1]
     apply from: "${project.projectDir}/overload.gradle"
@@ -60,13 +62,6 @@ subprojects {
         maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
     }
 
-    apply plugin: 'eu.xenit.docker-alfresco'
-    apply plugin: 'eu.xenit.docker-compose.auto'
-
-    configurations {
-        sharedLib
-    }
-
     dependencies {
         if (project.hasProperty("alfrescoBaseWarBom")) {
             baseAlfrescoWar platform("${alfrescoBaseWarBom}")
@@ -75,21 +70,15 @@ subprojects {
         }
         baseAlfrescoWar "${alfrescoBaseWar}"
         alfrescoAmp project(path: ":alfresco-actuators", configuration: "amp")
-        if (alfrescoBaseImage.contains("alfresco-repository-skeleton")) {
-            sharedLib 'org.postgresql:postgresql:42.2.6'
-        }
+        alfrescoSM 'org.postgresql:postgresql:42.2.6'
         alfrescoSM "org.orderofthebee.support-tools:support-tools-repo:1.2.0.0"
 
 
     }
 
     dockerAlfresco {
         baseImage = "${alfrescoBaseImage}"
-        leanImage = !alfrescoBaseImage.contains("alfresco-repository-skeleton")
-    }
-
-    createDockerFile {
-        smartCopy(configurations.sharedLib, '${CATALINA_HOME}/shared/lib/')
+        leanImage = false
     }
 
     dockerCompose {

settings.gradle

@@ -4,7 +4,7 @@ rootProject.name = 'alfresco-actuators'
 include ':alfresco-actuators'
 
 include ':integration-tests'
-["61", "62", "70", "71", "72", "73"].each { version ->
+["61", "62", "70", "71", "72", "73", "74"].each { version ->
     include ":integration-tests:alfresco-community-${version}"
     include ":integration-tests:alfresco-enterprise-${version}"
 }