diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index be74e890..8bd8bcac 100644 --- 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 index 211e8f41..876fb160 100644 --- 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 index 960f10c8..32275785 100644 --- 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 index 2102b26c..d067833d 100644 --- 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 index 6a834f59..124db83a 100644 --- 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 index c753b9b2..be971cd6 100644 --- 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 index 65e69b53..eb9b1555 100644 --- 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 index 2bcefd85..a0ee4833 100644 --- 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 index a881b76a..22b7c960 100644 --- 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 index e982cbc9..e31cef19 100644 --- 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 index 4812d13e..f146ce0a 100755 --- 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 index f1590ff4..25099a5a 100644 --- 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 index dd4794e6..c54c9094 100644 --- 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 index eb7c1832..616354f1 100644 --- 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 index ab299895..1aa39895 100644 --- 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 index 5ec2f7ea..75c55a3f 100644 --- 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 index 17d41464..1fe13d91 100644 --- 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" + } ] } } diff --git a/tengine/aio/artifacts.json b/tengine/aio/artifacts.json index 9fd32092..87215194 100644 --- a/tengine/aio/artifacts.json +++ b/tengine/aio/artifacts.json @@ -19,6 +19,16 @@ "repository": "releases", "group": "org.alfresco" } + ], + "acs73": [ + { + "name": "alfresco-transform-core-aio", + "version": "3.1.2", + "path": "tengine/aio", + "classifier": ".jar", + "repository": "releases", + "group": "org.alfresco" + } ] } } diff --git a/tengine/imagemagick/artifacts.json b/tengine/imagemagick/artifacts.json index e4b34ead..9de99675 100644 --- a/tengine/imagemagick/artifacts.json +++ b/tengine/imagemagick/artifacts.json @@ -83,6 +83,48 @@ "repository": "releases", "group": "org.alfresco" } + ], + "acs73": [ + { + "name": "imagemagick-distribution", + "version": "7.1.0-16-ci-10", + "path": "tengine/imagemagick/libs", + "classifier": "-libs-el9.rpm", + "repository": "thirdparty", + "group": "org.imagemagick" + }, + { + "name": "imagemagick-distribution", + "version": "7.1.0-16-ci-10", + "path": "tengine/imagemagick", + "classifier": "-el9.rpm", + "repository": "thirdparty", + "group": "org.imagemagick" + }, + { + "name": "imagemagick-distribution", + "version": "7.1.0-16-ci-10", + "path": "tengine/imagemagick/libs", + "classifier": "-libs-el9-aarch64.rpm", + "repository": "thirdparty", + "group": "org.imagemagick" + }, + { + "name": "imagemagick-distribution", + "version": "7.1.0-16-ci-10", + "path": "tengine/imagemagick", + "classifier": "-el9-aarch64.rpm", + "repository": "thirdparty", + "group": "org.imagemagick" + }, + { + "name": "alfresco-transform-imagemagick", + "version": "3.1.2", + "path": "tengine/imagemagick", + "classifier": ".jar", + "repository": "releases", + "group": "org.alfresco" + } ] } } diff --git a/tengine/libreoffice/artifacts.json b/tengine/libreoffice/artifacts.json index c720b08f..2c904f22 100644 --- a/tengine/libreoffice/artifacts.json +++ b/tengine/libreoffice/artifacts.json @@ -35,6 +35,24 @@ "repository": "releases", "group": "org.alfresco" } + ], + "acs73": [ + { + "name": "libreoffice-dist", + "version": "7.2.5", + "path": "tengine/libreoffice", + "classifier": "-linux.gz", + "repository": "thirdparty", + "group": "org.libreoffice" + }, + { + "name": "alfresco-transform-libreoffice", + "version": "3.1.2", + "path": "tengine/libreoffice", + "classifier": ".jar", + "repository": "releases", + "group": "org.alfresco" + } ] } } diff --git a/tengine/misc/artifacts.json b/tengine/misc/artifacts.json index 42d2c9ec..eeb80d32 100644 --- a/tengine/misc/artifacts.json +++ b/tengine/misc/artifacts.json @@ -19,6 +19,16 @@ "repository": "releases", "group": "org.alfresco" } + ], + "acs73": [ + { + "name": "alfresco-transform-misc", + "version": "3.1.2", + "path": "tengine/misc", + "classifier": ".jar", + "repository": "releases", + "group": "org.alfresco" + } ] } } diff --git a/tengine/pdfrenderer/artifacts.json b/tengine/pdfrenderer/artifacts.json index a8481c2b..6121bbbf 100644 --- a/tengine/pdfrenderer/artifacts.json +++ b/tengine/pdfrenderer/artifacts.json @@ -51,6 +51,24 @@ "repository": "releases", "group": "org.alfresco" } + ], + "acs73": [ + { + "name": "alfresco-pdf-renderer", + "version": "1.1", + "path": "tengine/pdfrenderer", + "classifier": "-linux.tgz", + "repository": "releases", + "group": "org.alfresco" + }, + { + "name": "alfresco-transform-pdf-renderer", + "version": "3.1.2", + "path": "tengine/pdfrenderer", + "classifier": ".jar", + "repository": "releases", + "group": "org.alfresco" + } ] } } diff --git a/tengine/tika/artifacts.json b/tengine/tika/artifacts.json index d5ca131d..870cc05a 100644 --- a/tengine/tika/artifacts.json +++ b/tengine/tika/artifacts.json @@ -19,6 +19,16 @@ "repository": "releases", "group": "org.alfresco" } + ], + "acs73": [ + { + "name": "alfresco-transform-tika", + "version": "3.1.2", + "path": "tengine/tika", + "classifier": ".jar", + "repository": "releases", + "group": "org.alfresco" + } ] } } diff --git a/test/helm/test-overrides-73.yaml b/test/helm/test-overrides-73.yaml new file mode 100644 index 00000000..e9d2d83c --- /dev/null +++ b/test/helm/test-overrides-73.yaml @@ -0,0 +1,24 @@ +alfresco-search: + enabled: true +alfresco-search-enterprise: + enabled: false +elasticsearch: + enabled: false +elasticsearch-audit: + enabled: false +kibana-audit: + enabled: false +alfresco-audit-storage: + enabled: false +dtas: + config: + assertions: + acs: + version: 7.3.2 + modules: + - id: org.alfresco.integrations.google.docs + version: 3.3.1 + installed: true + - id: alfresco-aos-module + version: 1.5.0 + installed: true diff --git a/test/74-override.yaml b/test/solr-search-override.yaml similarity index 100% rename from test/74-override.yaml rename to test/solr-search-override.yaml