OPSEXP-2921 Add ACS version 7.3 (#113)

Alfresco · Nov 12, 2024 · 4b0d6a1 · 4b0d6a1
1 parent 37fd027
commit 4b0d6a1
Show file tree

Hide file tree

Showing 25 changed files with 380 additions and 5 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [23, 74]
+        version: [23, 74, 73]
     with:
       tag: ${{ github.event_name == 'pull_request' && format('pr-{0}-v{1}', github.event.pull_request.number, matrix.version) || format('{0}-v{1}', github.ref_name, matrix.version) }}
       acs_version: ${{ matrix.version }}

diff --git a/.github/workflows/reusable_build_and_test.yml b/.github/workflows/reusable_build_and_test.yml
@@ -137,6 +137,9 @@ jobs:
           elif [[ "${{ inputs.acs_version }}" == "74" ]]; then
             echo 'compose_matrix_json={"edition": ["74"]}' >> $GITHUB_OUTPUT
             echo 'helm_matrix_json={"arch": ["amd64"], "edition": ["74"]}' >> $GITHUB_OUTPUT
+          elif [[ "${{ inputs.acs_version }}" == "73" ]]; then
+            echo 'compose_matrix_json={"edition": ["73"]}' >> $GITHUB_OUTPUT
+            echo 'helm_matrix_json={"arch": ["amd64"], "edition": ["73"]}' >> $GITHUB_OUTPUT
           fi
 
   compose-test:
@@ -170,15 +173,19 @@ jobs:
         run: |
           if [[ "${{ matrix.edition }}" == "74" ]]; then
             echo "UPSTREAM_COMPOSE_PATH=test/7.4.N-compose.yaml" >> $GITHUB_ENV
+            echo "OVERRIDE_COMPOSE_PATH=test/solr-search-override.yaml" >> $GITHUB_ENV
+          elif [[ "${{ matrix.edition }}" == "73" ]]; then
+            echo "UPSTREAM_COMPOSE_PATH=test/7.3.N-compose.yaml" >> $GITHUB_ENV
+            echo "OVERRIDE_COMPOSE_PATH=test/solr-search-override.yaml" >> $GITHUB_ENV
           elif [[ "${{ matrix.edition }}" == "community" ]]; then
             echo "UPSTREAM_COMPOSE_PATH=test/community-compose.yaml" >> $GITHUB_ENV
+            echo "OVERRIDE_COMPOSE_PATH=test/community-override.yaml" >> $GITHUB_ENV
           else
             echo "UPSTREAM_COMPOSE_PATH=test/compose.yaml" >> $GITHUB_ENV
+            echo "OVERRIDE_COMPOSE_PATH=test/enterprise-override.yaml" >> $GITHUB_ENV
           fi
 
       - name: Merge Docker Compose files
-        env:
-          OVERRIDE_COMPOSE_PATH: test/${{ matrix.edition }}-override.yaml
         run: docker compose -f ${{ env.UPSTREAM_COMPOSE_PATH }} -f ${{ env.OVERRIDE_COMPOSE_PATH }} config > ${{ env.MERGED_COMPOSE_PATH }}
 
       - name: Verify docker-compose (${{ matrix.edition }})
@@ -279,6 +286,8 @@ jobs:
         run: |
           if [[ "${{ matrix.edition }}" == "74" ]]; then
             echo "UPSTREAM_HELM_VALUES=7.4.N_values.yaml" >> $GITHUB_ENV
+          elif [[ "${{ matrix.edition }}" == "73" ]]; then
+            echo "UPSTREAM_HELM_VALUES=7.3.N_values.yaml" >> $GITHUB_ENV
           elif [[ "${{ matrix.edition }}" == "community" ]]; then
             echo "UPSTREAM_HELM_VALUES=community_values.yaml" >> $GITHUB_ENV
           else

diff --git a/adf-apps/acc/artifacts.json b/adf-apps/acc/artifacts.json
@@ -19,6 +19,16 @@
         "group": "org.alfresco",
         "repository": "releases"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-control-center",
+        "version": "7.9.0",
+        "path": "adf-apps/acc",
+        "classifier": ".zip",
+        "group": "org.alfresco",
+        "repository": "internal-releases"
+      }
     ]
   }
 }
diff --git a/adf-apps/adw/artifacts.json b/adf-apps/adw/artifacts.json
@@ -19,6 +19,16 @@
           "group": "org.alfresco",
           "repository": "enterprise-releases"
         }
+      ],
+      "acs73": [
+        {
+          "name": "alfresco-digital-workspace",
+          "version": "4.4.1",
+          "path": "adf-apps/adw",
+          "classifier": ".zip",
+          "group": "org.alfresco",
+          "repository": "enterprise-releases"
+        }
       ]
     }
   }
diff --git a/ats/sfs/artifacts.json b/ats/sfs/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-shared-file-store-controller",
+        "version": "2.1.2",
+        "path": "ats/sfs",
+        "classifier": ".jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/ats/trouter/artifacts.json b/ats/trouter/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-transform-router",
+        "version": "2.1.2",
+        "path": "ats/trouter",
+        "classifier": ".jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/connector/ms365/artifacts.json b/connector/ms365/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "onedrive-springboot",
+        "version": "1.1.3.2",
+        "path": "connector/ms365",
+        "classifier": ".jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/connector/msteams/artifacts.json b/connector/msteams/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-ms-teams-springboot",
+        "version": "1.1.0",
+        "path": "connector/msteams",
+        "classifier": ".jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/repository/Dockerfile b/repository/Dockerfile
@@ -29,7 +29,7 @@ RUN sed -i 's|../modules/platform|modules/platform|' ${CATALINA_HOME}/conf/Catal
 RUN sed -i \
   -re "s|(appender.rolling.fileName\=)(alfresco.log)|\1${CATALINA_HOME}/logs\/\2|" \
   -re "s|(appender.rolling.filePattern=)(alfresco.log.%d\{yyyy-MM-dd\})|\1${CATALINA_HOME}/logs\/\2|" \
-  ${CATALINA_HOME}/webapps/alfresco/WEB-INF/classes/log4j2.properties
+  ${CATALINA_HOME}/webapps/alfresco/WEB-INF/classes/log4j*.properties
 
 COPY amps /tmp/amps
 COPY amps_${ALFRESCO_REPO_EDITION} /tmp/amps

diff --git a/repository/artifacts.json b/repository/artifacts.json
@@ -115,6 +115,64 @@
         "group": "org.alfresco",
         "repository": "public"
       }
+    ],
+    "acs73": [
+      {
+        "name": "postgresql",
+        "version": "42.6.1",
+        "classifier": ".jar",
+        "group": "org.postgresql",
+        "repository": "public",
+        "path": "repository/libs"
+      },
+      {
+        "name": "alfresco-share-services",
+        "version": "19.15",
+        "path": "repository/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco",
+        "repository": "releases"
+      },
+      {
+        "name": "alfresco-aos-module",
+        "version": "1.5.0",
+        "path": "repository/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco.aos-module",
+        "repository": "releases"
+      },
+      {
+        "name": "alfresco-device-sync-repo",
+        "version": "3.11.3",
+        "path": "repository/amps_enterprise",
+        "classifier": ".amp",
+        "group": "org.alfresco.services.sync",
+        "repository": "enterprise-releases"
+      },
+      {
+        "name": "alfresco-googledrive-repo-enterprise",
+        "version": "3.3.1",
+        "path": "repository/amps_enterprise",
+        "classifier": ".amp",
+        "group": "org.alfresco.integrations",
+        "repository": "enterprise-releases"
+      },
+      {
+        "name": "alfresco-content-services-distribution",
+        "version": "7.3.2.1",
+        "path": "repository/distribution",
+        "classifier": ".zip",
+        "group": "org.alfresco",
+        "repository": "enterprise-releases"
+      },
+      {
+        "name": "alfresco-content-services-community-distribution",
+        "version": "7.3.2",
+        "path": "repository/distribution",
+        "classifier": ".zip",
+        "group": "org.alfresco",
+        "repository": "public"
+      }
     ]
   }
 }
diff --git a/scripts/fetch-compose.sh b/scripts/fetch-compose.sh
@@ -10,7 +10,7 @@ if [ "$#" -ne 1 ]; then
 fi
 
 ACS_DEPLOYMENT_VERSION="$1"
-COMPOSE_FILES=(compose.yaml community-compose.yaml 7.4.N-compose.yaml)
+COMPOSE_FILES=(compose.yaml community-compose.yaml 7.4.N-compose.yaml 7.3.N-compose.yaml)
 DESTINATION_DIR="$(dirname "$0")/../test"
 
 for COMPOSE_FILE in "${COMPOSE_FILES[@]}"; do

diff --git a/search/enterprise/all-in-one/artifacts.json b/search/enterprise/all-in-one/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-elasticsearch-live-indexing",
+        "version": "3.2.1",
+        "path": "search/enterprise/all-in-one",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/search/enterprise/common/artifacts.json b/search/enterprise/common/artifacts.json
@@ -83,6 +83,48 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-elasticsearch-live-indexing-mediation",
+        "version": "3.2.1",
+        "path": "search/enterprise/common",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      },
+      {
+        "name": "alfresco-elasticsearch-live-indexing-metadata",
+        "version": "3.2.1",
+        "path": "search/enterprise/common",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      },
+      {
+        "name": "alfresco-elasticsearch-live-indexing-path",
+        "version": "3.2.1",
+        "path": "search/enterprise/common",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      },
+      {
+        "name": "alfresco-elasticsearch-live-indexing-content",
+        "version": "3.2.1",
+        "path": "search/enterprise/common",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      },
+      {
+        "name": "alfresco-elasticsearch-live-indexing",
+        "version": "3.2.1",
+        "path": "search/enterprise/common",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/search/enterprise/reindexing/artifacts.json b/search/enterprise/reindexing/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-elasticsearch-reindexing",
+        "version": "3.2.1",
+        "path": "search/enterprise/reindexing",
+        "classifier": "-app.jar",
+        "repository": "enterprise-releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/search/service/artifacts.json b/search/service/artifacts.json
@@ -19,6 +19,16 @@
         "repository": "releases",
         "group": "org.alfresco"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-search-services",
+        "version": "2.0.12",
+        "path": "search/service/distribution",
+        "classifier": ".zip",
+        "repository": "releases",
+        "group": "org.alfresco"
+      }
     ]
   }
 }
diff --git a/share/artifacts.json b/share/artifacts.json
@@ -51,6 +51,32 @@
         "group": "org.alfresco.integrations",
         "repository": "releases"
       }
+    ],
+    "acs73": [
+      {
+        "name": "alfresco-content-services-share-distribution",
+        "version": "7.3.2.1",
+        "path": "share/distribution",
+        "classifier": ".zip",
+        "group": "org.alfresco",
+        "repository": "enterprise-releases"
+      },
+      {
+        "name": "alfresco-content-services-community-distribution",
+        "version": "7.4.2",
+        "path": "share/distribution",
+        "classifier": ".zip",
+        "group": "org.alfresco",
+        "repository": "public"
+      },
+      {
+        "name": "alfresco-googledrive-share",
+        "version": "3.3.1",
+        "path": "share/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco.integrations",
+        "repository": "releases"
+      }
     ]
   }
 }
diff --git a/sync/artifacts.json b/sync/artifacts.json
@@ -35,6 +35,24 @@
         "repository": "public",
         "path": "sync/configs/connectors"
       }
+    ],
+    "acs73": [
+      {
+        "name": "sync-dist-6.x",
+        "version": "3.11.3",
+        "path": "sync/distribution",
+        "classifier": ".zip",
+        "group": "org.alfresco.services.sync",
+        "repository": "enterprise-releases"
+      },
+      {
+        "name": "postgresql",
+        "version": "42.6.1",
+        "classifier": ".jar",
+        "group": "org.postgresql",
+        "repository": "public",
+        "path": "sync/configs/connectors"
+      }
     ]
   }
 }