ALFREDOPS-852 update integration tests builds

xenit-eu · Dec 7, 2023 · c62414c · c62414c
1 parent 22e7e9a
commit c62414c
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 29 deletions.
diff --git a/integration-tests/alfresco-community-62/overload.gradle b/integration-tests/alfresco-community-62/overload.gradle
@@ -1,6 +1,7 @@
 ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:6.2.1-A7'
     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'
     solrFlavor = 'solr6'
 
     extraDependencies = [

diff --git a/integration-tests/alfresco-community-70/overload.gradle b/integration-tests/alfresco-community-70/overload.gradle
@@ -1,7 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.0.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.0.1-A7'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.0.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.0'
     solrFlavor = 'solr6'
 
     extraDependencies = [

diff --git a/integration-tests/alfresco-community-71/overload.gradle b/integration-tests/alfresco-community-71/overload.gradle
@@ -1,7 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.1.1'
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.1.0.1'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.1.1'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.1'
     solrFlavor = 'solr6'
 
     extraDependencies = [

diff --git a/integration-tests/alfresco-community-72/overload.gradle b/integration-tests/alfresco-community-72/overload.gradle
@@ -1,7 +1,7 @@
 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'
     solrFlavor = 'solr6'
 
     extraDependencies = [

diff --git a/integration-tests/alfresco-community-73/overload.gradle b/integration-tests/alfresco-community-73/overload.gradle
@@ -1,7 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.3.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.3.1'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.3.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.3'
     solrFlavor = 'solr6'
 
 //    postgresImage = 'postgres:13'

diff --git a/integration-tests/alfresco-community-74/overload.gradle b/integration-tests/alfresco-community-74/overload.gradle
@@ -1,7 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.4.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.4.1.1-A1'
     alfrescoBaseWar = 'org.alfresco:content-services-community@war'
-    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.4.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.4'
     solrFlavor = 'solr6'
 
 //    postgresImage = 'postgres:13'

diff --git a/integration-tests/alfresco-enterprise-62/overload.gradle b/integration-tests/alfresco-enterprise-62/overload.gradle
@@ -1,6 +1,6 @@
 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 = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.2.2.19'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:6.2'
     solrFlavor = 'solr6'
 }
diff --git a/integration-tests/alfresco-enterprise-70/overload.gradle b/integration-tests/alfresco-enterprise-70/overload.gradle
@@ -1,8 +1,7 @@
 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 = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.0.1.3'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.0'
 
     solrFlavor = 'solr6'
 }
diff --git a/integration-tests/alfresco-enterprise-71/overload.gradle b/integration-tests/alfresco-enterprise-71/overload.gradle
@@ -1,8 +1,7 @@
 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 = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.1.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.1'
 
     solrFlavor = 'solr6'
 }
diff --git a/integration-tests/alfresco-enterprise-72/overload.gradle b/integration-tests/alfresco-enterprise-72/overload.gradle
@@ -1,8 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.0'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.1'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
-
-    alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.2.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.2'
 
     solrFlavor = 'solr6'
 }
diff --git a/integration-tests/alfresco-enterprise-73/overload.gradle b/integration-tests/alfresco-enterprise-73/overload.gradle
@@ -1,8 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.0.1'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.1'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
-
-    alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.3.0'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.3'
 
     solrFlavor = 'solr6'
 }
diff --git a/integration-tests/alfresco-enterprise-74/overload.gradle b/integration-tests/alfresco-enterprise-74/overload.gradle
@@ -1,8 +1,7 @@
 ext {
-    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.0.1'
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.1.3'
     alfrescoBaseWar = 'org.alfresco:content-services@war'
-
-    alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.4.0.1'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.4'
 
     solrFlavor = 'solr6'
 }
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
@@ -75,11 +75,11 @@ subprojects {
         alfrescoSM project.extraDependencies
 
         baseAlfrescoWar "${alfrescoBaseWar}"
+        alfrescoSM  group: 'org.postgresql', name: 'postgresql', version: '42.4.0'
     }
 
     dockerAlfresco {
         baseImage = "${alfrescoBaseImage}"
-        leanImage = true
 
         dockerBuild {
             repository = "private.docker.xenit.eu/alfred-telemetry/alfresco-alfred-telemetry-${alfrescoVersion}"