Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2921 Add ACS version 7.3 #113

Merged
merged 37 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
393c8a0
OPSEXP-2849 Allow building and testing multiple versions of ACS
pmacius Nov 4, 2024
ec428aa
test
pmacius Nov 4, 2024
712b949
move permissions
pmacius Nov 4, 2024
4b44545
move precommit to parent
pmacius Nov 4, 2024
b5ee8d1
fetching script path to dir as a 2nd argument
pmacius Nov 4, 2024
0592617
add few fixes
pmacius Nov 4, 2024
da7cbf6
fix artifacts cache and fix artifacts for adw
pmacius Nov 4, 2024
a799b67
compose multiversion testing wip
pmacius Nov 5, 2024
c051f78
try only compose testing
pmacius Nov 5, 2024
737809d
try to fix build matrix
pmacius Nov 5, 2024
6116200
use simpler way
pmacius Nov 5, 2024
63fdfcd
missing fi
pmacius Nov 5, 2024
6913dd1
fix env
pmacius Nov 5, 2024
9ad1d20
set tomcat to 9 when version is different than 23
pmacius Nov 5, 2024
7e2f2ff
prepare rebase
pmacius Nov 5, 2024
4c1ac11
enable helm
pmacius Nov 5, 2024
f52121c
change base helm values
pmacius Nov 5, 2024
f5995e1
try without completly changing functionality of fetch-artifacts script
pmacius Nov 5, 2024
1bd2c99
fine tune build matrix job
pmacius Nov 5, 2024
39f380a
dont fetch 73 for now
pmacius Nov 5, 2024
91742c3
addres the review
pmacius Nov 6, 2024
e4503a9
use the tomcat function for now
pmacius Nov 6, 2024
95b30a0
try script on workflow
pmacius Nov 6, 2024
8c7691d
remove the script add make tomcat versions determine change the step …
pmacius Nov 7, 2024
1cd0aef
missing folder
pmacius Nov 7, 2024
e36d83f
add gikeep
pmacius Nov 7, 2024
5908059
Update .github/workflows/reusable_build_and_test.yml
pmacius Nov 7, 2024
47710e2
Revert "Update .github/workflows/reusable_build_and_test.yml"
pmacius Nov 7, 2024
4783660
fix cleanup
pmacius Nov 7, 2024
c01d342
OPSEXP-2921 Add ACS version 7.3
pmacius Nov 7, 2024
9cd388c
fix repo path
pmacius Nov 7, 2024
fd77634
remove pdr renderer 1.1 arm64
pmacius Nov 7, 2024
69bc2ac
73 version has a name log4j.properties instead of log4j2.properties
pmacius Nov 8, 2024
9c8c606
add testing files
pmacius Nov 8, 2024
8ec9bdf
fetch compose for 7.3
pmacius Nov 8, 2024
232b2ae
remove leftover
pmacius Nov 12, 2024
aa0ac6e
use common override for version 73 and 74
pmacius Nov 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/cleanup_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
packages: ${{ env.PACKAGE_NAMES }}
delete-tags: ${{ env.PR_TAGS }}
dry-run: false
use-regex: true
pmacius marked this conversation as resolved.
Show resolved Hide resolved

- name: Remove images when requested
uses: dataaxiom/ghcr-cleanup-action@98b4022383d6ddb70ccbf6a378b4d8c67a60f066 # v1.0.13
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/reusable_build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -170,6 +173,8 @@ jobs:
run: |
if [[ "${{ matrix.edition }}" == "74" ]]; then
echo "UPSTREAM_COMPOSE_PATH=test/7.4.N-compose.yaml" >> $GITHUB_ENV
elif [[ "${{ matrix.edition }}" == "73" ]]; then
echo "UPSTREAM_COMPOSE_PATH=test/7.3.N-compose.yaml" >> $GITHUB_ENV
elif [[ "${{ matrix.edition }}" == "community" ]]; then
echo "UPSTREAM_COMPOSE_PATH=test/community-compose.yaml" >> $GITHUB_ENV
else
Expand Down Expand Up @@ -279,6 +284,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
Expand Down
10 changes: 10 additions & 0 deletions adf-apps/acc/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions adf-apps/adw/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions ats/sfs/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions ats/trouter/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions connector/ms365/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions connector/msteams/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
2 changes: 1 addition & 1 deletion repository/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
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
gionn marked this conversation as resolved.
Show resolved Hide resolved

COPY amps /tmp/amps
COPY amps_${ALFRESCO_REPO_EDITION} /tmp/amps
Expand Down Expand Up @@ -63,7 +63,7 @@

FROM repo-rhlike AS repo-rockylinux9

FROM repo-${DISTRIB_NAME}${DISTRIB_MAJOR}

Check warning on line 66 in repository/Dockerfile

View workflow job for this annotation

GitHub Actions / Build v23 / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG repo-${DISTRIB_NAME}${DISTRIB_MAJOR} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/

Check warning on line 66 in repository/Dockerfile

View workflow job for this annotation

GitHub Actions / Build v73 / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG repo-${DISTRIB_NAME}${DISTRIB_MAJOR} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/

Check warning on line 66 in repository/Dockerfile

View workflow job for this annotation

GitHub Actions / Build v74 / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG repo-${DISTRIB_NAME}${DISTRIB_MAJOR} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
USER ${ALFRESCO_REPO_USER_NAME}

CMD ["/entrypoint.sh"]
58 changes: 58 additions & 0 deletions repository/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
2 changes: 1 addition & 1 deletion scripts/fetch-compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions search/enterprise/all-in-one/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
42 changes: 42 additions & 0 deletions search/enterprise/common/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions search/enterprise/reindexing/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
10 changes: 10 additions & 0 deletions search/service/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
26 changes: 26 additions & 0 deletions share/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
18 changes: 18 additions & 0 deletions sync/artifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
Loading
Loading