From f82d0c087608a188b56b66771e635e5223975c67 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Mon, 29 Jul 2024 18:33:41 +0200
Subject: [PATCH 01/35] ignore OS packages

---
 .gitignore                                        | 2 ++
 scripts/{fetch-artifact.sh => fetch-artifacts.sh} | 0
 2 files changed, 2 insertions(+)
 rename scripts/{fetch-artifact.sh => fetch-artifacts.sh} (100%)

diff --git a/.gitignore b/.gitignore
index fa16c20d..9bfd90ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.zip
 *.amp
+*.rpm
+*.deb
 dist
 *.jar
 *.rpm
diff --git a/scripts/fetch-artifact.sh b/scripts/fetch-artifacts.sh
similarity index 100%
rename from scripts/fetch-artifact.sh
rename to scripts/fetch-artifacts.sh

From 252c01034b5e750a7aebb8999c194e3d53fa13b2 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Tue, 30 Jul 2024 20:17:08 +0200
Subject: [PATCH 02/35] allow fetching artifacts for a subset of targets only

---
 scripts/fetch-artifacts.sh | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/fetch-artifacts.sh b/scripts/fetch-artifacts.sh
index a1017ca4..8ba3e9f0 100755
--- a/scripts/fetch-artifacts.sh
+++ b/scripts/fetch-artifacts.sh
@@ -6,16 +6,14 @@ REPO_ROOT=$(dirname $0)
 ACS_VERSION=${ACS_VERSION:=23.2.2}
 INDEX_KEY=${ACS_VERSION%%.*}
 
-cd ${REPO_ROOT}/..
-
-for i in $(find . -name artifacts.json -mindepth 2); do
-  for j in $(jq -r ".artifacts.acs${INDEX_KEY} | keys | .[]" $i); do
-    ARTIFACT_REPO=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].repository" $i)
-    ARTIFACT_NAME=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].name" $i)
-    ARTIFACT_VERSION=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].version" $i)
-    ARTIFACT_EXT=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].classifier" $i)
-    ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].group" $i)
-    ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].path" $i)
+do_fetch_mvn() {
+  for i in $(jq -r ".artifacts.acs${INDEX_KEY} | keys | .[]" $1); do
+    ARTIFACT_REPO=$(jq -r ".artifacts.acs${INDEX_KEY}[$i].repository" $1)
+    ARTIFACT_NAME=$(jq -r ".artifacts.acs${INDEX_KEY}[$i].name" $1)
+    ARTIFACT_VERSION=$(jq -r ".artifacts.acs${INDEX_KEY}[$i].version" $1)
+    ARTIFACT_EXT=$(jq -r ".artifacts.acs${INDEX_KEY}[$i].classifier" $1)
+    ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$i].group" $1)
+    ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$i].path" $1)
     ARTIFACT_BASEURL="https://nexus.alfresco.com/nexus/repository/${ARTIFACT_REPO}"
     ARTIFACT_FINAL_PATH="${ARTIFACT_PATH}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}"
     if [ -f "${ARTIFACT_FINAL_PATH}" ]; then
@@ -27,4 +25,12 @@ for i in $(find . -name artifacts.json -mindepth 2); do
       -O "${ARTIFACT_FINAL_PATH}" \
       --no-verbose
   done
+}
+
+cd ${REPO_ROOT}/..
+
+TARGETS=$(find . -regex "./${1:+$1/}.*" -name artifacts.json -mindepth 2 -print)
+
+for i in $TARGETS ; do
+  do_fetch_mvn $i
 done

From 2528f67cb3aa8df123c66a9c195d84886808afb9 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Tue, 30 Jul 2024 20:33:27 +0200
Subject: [PATCH 03/35] add make wrapper and initial doc

---
 Makefile  | 43 +++++++++++++++++++++++++++++++++++++++++++
 README.md | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 Makefile
 create mode 100644 README.md

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..7a61b203
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,43 @@
+clean:
+	@echo "Cleaning up Artifacts"
+	@find . \( -name "*.jar" -o -name "*.zip" -o -name  "*.rpm" -o -name "*.deb" \) -type f -delete
+
+prepare_repo: scripts/fetch-artifacts.sh
+	@echo "Fetching all artifacts for repository target"
+	@./scripts/fetch-artifacts.sh repository
+
+prepare_tengines: scripts/fetch-artifacts.sh
+	@echo "Fetching all artifacts for tengines targets"
+	@./scripts/fetch-artifacts.sh tengine
+
+prepare_ats: scripts/fetch-artifacts.sh
+	@echo "Fetching all artifacts for ats targets"
+	@./scripts/fetch-artifacts.sh ats
+
+prepare_search_enterprise: scripts/fetch-artifacts.sh
+	@echo "Fetching all artifacts for Search Enterprise targets"
+	@./scripts/fetch-artifacts.sh search/enterprise
+
+prepare_all: scripts/fetch-artifacts.sh
+	@echo "Fetching all artifacts"
+	@./scripts/fetch-artifacts.sh
+
+repo: prepare_repo
+	@echo "Building repository image"
+	@docker buildx bake --no-cache --progress=plain repository
+
+tengines: prepare_tengines
+	@echo "Building Transform Egnine images"
+	@docker buildx bake --no-cache --progress=plain tengines
+
+ats: prepare_ats prepare_tengines
+	@echo "Building Transform Service images"
+	@docker buildx bake --no-cache --progress=plain ats tengines
+
+search_enterprise: prepare_search_enterprise
+	@echo "Building Search Enterprise images"
+	@docker buildx bake --no-cache --progress=plain enterprise-search
+
+all: docker-bake.hcl prepare_all
+	@echo "Building all images"
+	@docker buildx bake --no-cache --progress=plain
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..0ca5c939
--- /dev/null
+++ b/README.md
@@ -0,0 +1,39 @@
+# Alfresco Docker images builder
+
+This projects aims at providing a quick and easy to build and maintain Alfresco
+Docker images.
+
+## Getting started quickly
+
+If you do not plan on applying specific customizations but just want to get
+They latest Alfresco images updated (e.g. with the latest OS security patches),
+you can simply run the command below from the root of this project:
+
+```bash
+make all
+```
+
+This command will build locally all the docjker images this project offers.
+At the time of writing, these are:
+
+* Alfresco Content Repository (Enterprise) 23.2.2
+* Alfresco Search Enterprise 4.4.0
+* Alfresco Transformation Services 4.1.3
+
+## Building the specific images
+
+If you want to build a specific image, you can run one of the following make target:
+
+* repo: build the Alfresco Content Repository image
+* search_enterprise: build the Alfresco Search Enterprise images
+* ats: build the Alfresco Transformation Service images 
+
+## Customizing the images
+
+### Customizing the Alfresco Content Repository image
+
+The Alfresco Content Repository image can be customized by adding different
+types of files in the right locations:
+
+* Alfresco Module Packages (AMPs) files in the [amps}(repository/amps/README.md) folder
+* Additional JAR files for the JRE in the [libs](repository/libs/README.md) folder

From cf2006f1e6b2c03fd81042e0c86825536a963ace Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Tue, 30 Jul 2024 20:35:58 +0200
Subject: [PATCH 04/35] fixup

---
 .github/workflows/build_and_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 4c678ca4..754d798e 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -40,7 +40,7 @@ jobs:
           echo "password ${{ secrets.NEXUS_PASSWORD }}" >> ~/.netrc
 
       - name: Fetch artifacts from nexus
-        run: ./scripts/fetch-artifact.sh
+        run: ./scripts/fetch-artifacts.sh
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
@@ -88,7 +88,7 @@ jobs:
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db  # v3.6.1
-    
+
       - name: Download artifacts
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:

From 7d0d0bf46b479bfe5c354424e3b02401ba2cc22b Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 31 Jul 2024 09:43:37 +0200
Subject: [PATCH 05/35] remove gitignore dup

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9bfd90ae..c31b1cbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,4 @@
 *.deb
 dist
 *.jar
-*.rpm
 *.gz

From e2aee05722012065a8f907689b6633758df936fe Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 31 Jul 2024 09:48:28 +0200
Subject: [PATCH 06/35] ignore and cleanup more archive types

---
 .gitignore | 1 +
 Makefile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c31b1cbb..9cf6a48e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 *.deb
 dist
 *.jar
+*.tgz
 *.gz
diff --git a/Makefile b/Makefile
index 7a61b203..f580f625 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 clean:
 	@echo "Cleaning up Artifacts"
-	@find . \( -name "*.jar" -o -name "*.zip" -o -name  "*.rpm" -o -name "*.deb" \) -type f -delete
+	@find . \( -name "*.jar" -o -name "*.zip" -o -name "*.gz" -o -name "*.tgz" -o -name  "*.rpm" -o -name "*.deb" \) -type f -delete
 
 prepare_repo: scripts/fetch-artifacts.sh
 	@echo "Fetching all artifacts for repository target"

From d005260b76b0a742ba5e469965fc34441283c2cf Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 31 Jul 2024 09:48:53 +0200
Subject: [PATCH 07/35] gitignore cleanup

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9cf6a48e..df913e83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.amp
 *.rpm
 *.deb
-dist
 *.jar
 *.tgz
 *.gz

From f06a4028c72460f9ff15880c7862044f9282c87b Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 31 Jul 2024 11:21:45 +0200
Subject: [PATCH 08/35] review comment

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0ca5c939..22b94d4d 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ Docker images.
 ## Getting started quickly
 
 If you do not plan on applying specific customizations but just want to get
-They latest Alfresco images updated (e.g. with the latest OS security patches),
-you can simply run the command below from the root of this project:
+Alfresco images updated (e.g. with the latest OS security patches), you can
+simply run the command below from the root of this project:
 
 ```bash
 make all

From 01ecd173388475e20524fa428ae287f150d66617 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 31 Jul 2024 12:56:01 +0200
Subject: [PATCH 09/35] review comment

---
 scripts/fetch-artifacts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fetch-artifacts.sh b/scripts/fetch-artifacts.sh
index 8ba3e9f0..bfb04db7 100755
--- a/scripts/fetch-artifacts.sh
+++ b/scripts/fetch-artifacts.sh
@@ -29,7 +29,7 @@ do_fetch_mvn() {
 
 cd ${REPO_ROOT}/..
 
-TARGETS=$(find . -regex "./${1:+$1/}.*" -name artifacts.json -mindepth 2 -print)
+TARGETS=$(find "${REPO_ROOT}/.." -regex "${REPO_ROOT}/../${1:+$1/}.*" -name artifacts.json -mindepth 2 -print)
 
 for i in $TARGETS ; do
   do_fetch_mvn $i

From de253da49cadf137c21f07011f85f120f3f957e0 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 31 Jul 2024 14:35:13 +0200
Subject: [PATCH 10/35] review comment

---
 .github/workflows/build_and_test.yml | 3 ---
 scripts/fetch-artifacts.sh           | 2 --
 2 files changed, 5 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 754d798e..c1be1420 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -39,9 +39,6 @@ jobs:
           echo "login ${{ secrets.NEXUS_USERNAME }}" >> ~/.netrc
           echo "password ${{ secrets.NEXUS_PASSWORD }}" >> ~/.netrc
 
-      - name: Fetch artifacts from nexus
-        run: ./scripts/fetch-artifacts.sh
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
 
diff --git a/scripts/fetch-artifacts.sh b/scripts/fetch-artifacts.sh
index bfb04db7..e910d076 100755
--- a/scripts/fetch-artifacts.sh
+++ b/scripts/fetch-artifacts.sh
@@ -27,8 +27,6 @@ do_fetch_mvn() {
   done
 }
 
-cd ${REPO_ROOT}/..
-
 TARGETS=$(find "${REPO_ROOT}/.." -regex "${REPO_ROOT}/../${1:+$1/}.*" -name artifacts.json -mindepth 2 -print)
 
 for i in $TARGETS ; do

From dea2dd7159561e75caa442d48b11a392e9c03cb5 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 2 Aug 2024 12:37:59 +0200
Subject: [PATCH 11/35] test Makefile independently

---
 .github/workflows/test-make.yml | 46 +++++++++++++++++++++++++++++++++
 Makefile                        |  3 +++
 2 files changed, 49 insertions(+)
 create mode 100644 .github/workflows/test-make.yml

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
new file mode 100644
index 00000000..9101ccd9
--- /dev/null
+++ b/.github/workflows/test-make.yml
@@ -0,0 +1,46 @@
+name: Test building using the make wrapper
+
+on:
+  push:
+    paths:
+      - 'Makefile'
+      - '.github/workflows/test-make.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  make-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup nexus authentication
+        run: |
+          echo "machine nexus.alfresco.com" >> ~/.netrc
+          echo "login ${{ secrets.NEXUS_USERNAME }}" >> ~/.netrc
+          echo "password ${{ secrets.NEXUS_PASSWORD }}" >> ~/.netrc
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
+
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Make Docker images
+        id: make
+        run: |
+          make all_ci
+          echo "du=$(du -s | cut -f1)" >> $GITHUB_OUTPUT
+
+      - name: Check Images are loaded and artifacts are cleanup
+        run: |
+          echo -n "Checking images are loaded in local Docker Engine..."
+          docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || echo "No Alfresco image found" && exit 1
+          echo "Checking artifacts clean up worked"
+          if [ ${{ steps.make.outputs.DU }} -lt $(du -s | cut -f1) ]; then
+            echo "Artifacts were not cleaned up"
+            exit 1
+          fi
diff --git a/Makefile b/Makefile
index f580f625..e4eef370 100644
--- a/Makefile
+++ b/Makefile
@@ -41,3 +41,6 @@ search_enterprise: prepare_search_enterprise
 all: docker-bake.hcl prepare_all
 	@echo "Building all images"
 	@docker buildx bake --no-cache --progress=plain
+
+all_ci: repo tengines ats search_enterprise clean
+	@echo "Building all images using individual targets for Continuous Integration"

From 88267de82dd97ef8233fa475b710a270c9d4e4ca Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 14:01:33 +0200
Subject: [PATCH 12/35] test

---
 .github/workflows/build_and_test.yml | 40 +++++++++----------------
 .github/workflows/compose-test.yml   | 44 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/compose-test.yml

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 2a80f68f..a25e3829 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -4,9 +4,15 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - 'Makefile'
+      - '.github/workflows/test-make.yml'
   pull_request:
     branches:
       - main
+    paths-ignore:
+      - 'Makefile'
+      - '.github/workflows/test-make.yml'
 
 env:
   ACS_CHART_VERSION: 8.3.0
@@ -46,6 +52,9 @@ jobs:
           echo "login ${{ secrets.NEXUS_USERNAME }}" >> ~/.netrc
           echo "password ${{ secrets.NEXUS_PASSWORD }}" >> ~/.netrc
 
+      - name: Fetch artifacts from nexus
+        run: ./scripts/fetch-artifact.sh
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
 
@@ -89,32 +98,11 @@ jobs:
   compose-test:
     name: compose-test
     needs: build-test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db  # v3.6.1
-
-      - name: Download artifacts
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          path: /tmp
-          name: ${{ env.ARTIFACT_NAME }}
-
-      - name: Load Docker images
-        run: |
-          docker load -i /tmp/${{ env.ARTIFACT_NAME }}.tar
-          docker image ls -a
-
-      - name: Verify docker-compose
-        uses: Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v6.0.1
-        timeout-minutes: 10
-        with:
-          compose_pull: false
-          compose_file_path: test/docker-compose.yml
-          quay_username: ${{ secrets.QUAY_USERNAME }}
-          quay_password: ${{ secrets.QUAY_PASSWORD }}
-
-      - uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v6.0.0
+    uses: ./.github/workflows/compose-test.yml
+    with:
+      artifact_name: ${{ env.ARTIFACT_NAME }}
+      quay_username: ${{ secrets.QUAY_USERNAME }}
+      quay_password: ${{ secrets.QUAY_PASSWORD }}
 
   helm-test:
     name: helm test
diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml
new file mode 100644
index 00000000..67127daa
--- /dev/null
+++ b/.github/workflows/compose-test.yml
@@ -0,0 +1,44 @@
+name: Compose Test
+
+on:
+  workflow_call:
+    inputs:
+      artifact_name:
+        required: true
+        type: string
+      quay_username:
+        required: true
+        type: string
+      quay_password:
+        required: true
+        type: string
+
+jobs:
+  compose-test:
+    name: compose-test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db  # v3.6.1
+
+      - name: Download artifacts
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          path: /tmp
+          name: ${{ inputs.artifact_name }}
+
+      - name: Load Docker images
+        run: |
+          docker load -i /tmp/${{ inputs.artifact_name }}.tar
+          docker image ls -a
+
+      - name: Verify docker-compose
+        uses: Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v6.0.1
+        timeout-minutes: 10
+        with:
+          compose_pull: false
+          compose_file_path: test/docker-compose.yml
+          quay_username: ${{ inputs.quay_username }}
+          quay_password: ${{ inputs.quay_password }}
+
+      - uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v6.0.0

From 38777ba3ac9f436b3da629f8fee6615ff6955f9d Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 16:32:04 +0200
Subject: [PATCH 13/35] test

---
 .github/workflows/build_and_test.yml | 108 ++++----------------------
 .github/workflows/compose-test.yml   |  17 ++---
 .github/workflows/helm-test.yml      | 110 +++++++++++++++++++++++++++
 .github/workflows/test-make.yml      |  53 ++++++++++---
 4 files changed, 175 insertions(+), 113 deletions(-)
 create mode 100644 .github/workflows/helm-test.yml

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index a25e3829..c06d2897 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -40,6 +40,10 @@ jobs:
   build-test:
     runs-on: ubuntu-latest
     needs: pre-commit
+    outputs:
+      ARTIFACT_NAME: ${{ env.ARTIFACT_NAME }}
+      ACS_VALUES_VERSION: ${{ env.ACS_VALUES_VERSION }}
+      ACS_CHART_VERSION: ${{ env.ACS_CHART_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -87,7 +91,7 @@ jobs:
         run: df -h
         if: always()
 
-      - name: Upload images as artifact
+      - name: Upload images as artifact and set outputs with envs
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: ${{ env.ARTIFACT_NAME }}
@@ -96,101 +100,17 @@ jobs:
           compression-level: 0
 
   compose-test:
-    name: compose-test
-    needs: build-test
     uses: ./.github/workflows/compose-test.yml
+    needs: build-test
     with:
-      artifact_name: ${{ env.ARTIFACT_NAME }}
-      quay_username: ${{ secrets.QUAY_USERNAME }}
-      quay_password: ${{ secrets.QUAY_PASSWORD }}
+      artifact_name: ${{ needs.build-test.outputs.ARTIFACT_NAME }}
+    secrets: inherit
 
   helm-test:
-    name: helm test
+    uses: ./.github/workflows/helm-test.yml
     needs: build-test
-    runs-on: alfrescoPub-ubuntu2204-16G-4CPU
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          path: /tmp
-          name: ${{ env.ARTIFACT_NAME }}
-
-      - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.35.0
-        with:
-          ingress-nginx-ref: controller-v1.8.2
-          metrics: "true"
-
-      - name: Load Docker images
-        run: |
-          kind load image-archive -n chart-testing /tmp/${{ env.ARTIFACT_NAME }}.tar
-
-      - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
-        with:
-          version: "3.15.2"
-
-      - name: Login to Quay.io
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  # v3.1.0
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_PASSWORD }}
-
-      - name: Create registries auth secret
-        run: >-
-          kubectl create secret generic regcred
-          --from-file=.dockerconfigjson=$HOME/.docker/config.json
-          --type=kubernetes.io/dockerconfigjson
-
-      - name: Fetch upstream values for tests
-        run: >-
-          curl -ssfL
-          https://raw.githubusercontent.com/Alfresco/acs-deployment/${{ env.ACS_VALUES_VERSION }}/test/enterprise-integration-test-values.yaml
-          -o test/helm/enterprise-integration-test-values.yaml &&
-          ls -l test/helm/enterprise-integration-test-values.yaml &&
-          cat test/helm/enterprise-integration-test-values.yaml
-
-      - name: Helm install
-        id: helm_install
-        run: |
-          helm repo add alfresco https://kubernetes-charts.alfresco.com/stable
-          helm repo update
-          helm install acs alfresco/alfresco-content-services \
-            --version ${{ env.ACS_CHART_VERSION }} \
-            --set global.search.sharedSecret="$(openssl rand -hex 24)" \
-            --set global.known_urls=http://localhost \
-            --set global.alfrescoRegistryPullSecrets=regcred \
-            --values test/helm/enterprise-integration-test-values.yaml \
-            --values test/helm/test-overrides.yaml
-
-      - name: Watch Helm deployment
-        env:
-          HELM_INSTALL_TIMEOUT: 8m
-        run: |
-          kubectl get pods --watch &
-          KWPID=$!
-          kubectl wait --timeout=${{ env.HELM_INSTALL_TIMEOUT }} --all=true --for=condition=Ready pods
-          kill $KWPID
-          echo "Waiting for ESC Reindexing job to complete... "
-          kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing
-
-      - name: Debug cluster status after install
-        if: always() && steps.helm_install.outcome != 'skipped'
-        run: |
-          helm ls --all-namespaces --all
-          kubectl get all --all-namespaces
-          kubectl describe pod
-
-      - name: Run helm test
-        id: helm_test
-        run: helm test acs
-
-      - name: Debug cluster status after helm test
-        if: always() && steps.helm_test.outcome != 'skipped'
-        run: |
-          kubectl logs -l app.kubernetes.io/component=dtas --tail=-1
-          kubectl get all --all-namespaces
-          kubectl describe pod
+    with:
+      artifact_name: ${{ needs.build-test.outputs.ARTIFACT_NAME }}
+      ACS_VALUES_VERSION: ${{ needs.build-test.outputs.ACS_VALUES_VERSION }}
+      ACS_CHART_VERSION:  ${{ needs.build-test.outputs.ACS_CHART_VERSION }}
+    secrets: inherit  
diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml
index 67127daa..b86566b6 100644
--- a/.github/workflows/compose-test.yml
+++ b/.github/workflows/compose-test.yml
@@ -3,15 +3,14 @@ name: Compose Test
 on:
   workflow_call:
     inputs:
-      artifact_name:
+      ARTIFACT_NAME:
         required: true
         type: string
-      quay_username:
+    secrets:
+      QUAY_PASSWORD:
         required: true
-        type: string
-      quay_password:
+      QUAY_USERNAME:
         required: true
-        type: string
 
 jobs:
   compose-test:
@@ -25,11 +24,11 @@ jobs:
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           path: /tmp
-          name: ${{ inputs.artifact_name }}
+          name: ${{ inputs.ARTIFACT_NAME }}
 
       - name: Load Docker images
         run: |
-          docker load -i /tmp/${{ inputs.artifact_name }}.tar
+          docker load -i /tmp/${{ inputs.ARTIFACT_NAME }}.tar
           docker image ls -a
 
       - name: Verify docker-compose
@@ -38,7 +37,7 @@ jobs:
         with:
           compose_pull: false
           compose_file_path: test/docker-compose.yml
-          quay_username: ${{ inputs.quay_username }}
-          quay_password: ${{ inputs.quay_password }}
+          quay_username: ${{ secrets.QUAY_USERNAME }}
+          quay_password: ${{ secrets.QUAY_PASSWORD }}
 
       - uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v6.0.0
diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml
new file mode 100644
index 00000000..740421fc
--- /dev/null
+++ b/.github/workflows/helm-test.yml
@@ -0,0 +1,110 @@
+name: Compose Test
+
+on:
+  workflow_call:
+    inputs:
+      ARTIFACT_NAME:
+        required: true
+        type: string
+      ACS_VALUES_VERSION:
+        required: true
+        type: string
+      ACS_CHART_VERSION:
+        required: true
+        type: string
+    secrets:
+      QUAY_PASSWORD:
+        required: true
+      QUAY_USERNAME:
+        required: true
+
+jobs:
+  helm-test:
+    name: helm test
+    runs-on: alfrescoPub-ubuntu2204-16G-4CPU
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          path: /tmp
+          name: ${{ inputs.ARTIFACT_NAME }}
+
+      - name: Setup cluster
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.35.0
+        with:
+          ingress-nginx-ref: controller-v1.8.2
+          metrics: "true"
+
+      - name: Load Docker images
+        run: |
+          kind load image-archive -n chart-testing /tmp/${{ inputs.ARTIFACT_NAME }}.tar
+
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
+        with:
+          version: "3.15.2"
+
+      - name: Login to Quay.io
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  # v3.1.0
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      - name: Create registries auth secret
+        run: >-
+          kubectl create secret generic regcred
+          --from-file=.dockerconfigjson=$HOME/.docker/config.json
+          --type=kubernetes.io/dockerconfigjson
+
+      - name: Fetch upstream values for tests
+        run: >-
+          curl -ssfL
+          https://raw.githubusercontent.com/Alfresco/acs-deployment/${{ inputs.ACS_VALUES_VERSION }}/test/enterprise-integration-test-values.yaml
+          -o test/helm/enterprise-integration-test-values.yaml &&
+          ls -l test/helm/enterprise-integration-test-values.yaml &&
+          cat test/helm/enterprise-integration-test-values.yaml
+
+      - name: Helm install
+        id: helm_install
+        run: |
+          helm repo add alfresco https://kubernetes-charts.alfresco.com/stable
+          helm repo update
+          helm install acs alfresco/alfresco-content-services \
+            --version ${{ inputs.ACS_CHART_VERSION }} \
+            --set global.search.sharedSecret="$(openssl rand -hex 24)" \
+            --set global.known_urls=http://localhost \
+            --set global.alfrescoRegistryPullSecrets=regcred \
+            --values test/helm/enterprise-integration-test-values.yaml \
+            --values test/helm/test-overrides.yaml
+
+      - name: Watch Helm deployment
+        env:
+          HELM_INSTALL_TIMEOUT: 8m
+        run: |
+          kubectl get pods --watch &
+          KWPID=$!
+          kubectl wait --timeout=${{ env.HELM_INSTALL_TIMEOUT }} --all=true --for=condition=Ready pods
+          kill $KWPID
+          echo "Waiting for ESC Reindexing job to complete... "
+          kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing
+
+      - name: Debug cluster status after install
+        if: always() && steps.helm_install.outcome != 'skipped'
+        run: |
+          helm ls --all-namespaces --all
+          kubectl get all --all-namespaces
+          kubectl describe pod
+
+      - name: Run helm test
+        id: helm_test
+        run: helm test acs
+
+      - name: Debug cluster status after helm test
+        if: always() && steps.helm_test.outcome != 'skipped'
+        run: |
+          kubectl logs -l app.kubernetes.io/component=dtas --tail=-1
+          kubectl get all --all-namespaces
+          kubectl describe pod
diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index 9101ccd9..88ff69e1 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -10,8 +10,17 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
   cancel-in-progress: true
 
+env:
+  ACS_CHART_VERSION: 8.3.0
+  ACS_VALUES_VERSION: cfb0d426eff14a8b581c31e61db5e670da09ba3b
+  ARTIFACT_NAME: alfresco-docker-images
+
 jobs:
   make-test:
+    outputs:
+      ARTIFACT_NAME: ${{ env.ARTIFACT_NAME }}
+      ACS_VALUES_VERSION: ${{ env.ACS_VALUES_VERSION }}
+      ACS_CHART_VERSION: ${{ env.ACS_CHART_VERSION }}
     runs-on: ubuntu-latest
     steps:
       - name: Setup nexus authentication
@@ -32,15 +41,39 @@ jobs:
       - name: Make Docker images
         id: make
         run: |
-          make all_ci
-          echo "du=$(du -s | cut -f1)" >> $GITHUB_OUTPUT
+          make all
+
+      - name: Show all built images
+        run: docker images
 
-      - name: Check Images are loaded and artifacts are cleanup
+      - name: Docker save all baked images whose name include `alfresco`
         run: |
-          echo -n "Checking images are loaded in local Docker Engine..."
-          docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || echo "No Alfresco image found" && exit 1
-          echo "Checking artifacts clean up worked"
-          if [ ${{ steps.make.outputs.DU }} -lt $(du -s | cut -f1) ]; then
-            echo "Artifacts were not cleaned up"
-            exit 1
-          fi
+          docker save -o /tmp/${{ env.ARTIFACT_NAME }}.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco)
+
+      - name: Check disk space
+        run: df -h
+        if: always()
+
+      - name: Upload images as artifact and set outputs with envs
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: /tmp/${{ env.ARTIFACT_NAME }}.tar
+          retention-days: 1
+          compression-level: 0
+
+  compose-test:
+    uses: ./.github/workflows/compose-test.yml
+    needs: make-test
+    with:
+      artifact_name: ${{ needs.make-test.outputs.ARTIFACT_NAME }}
+    secrets: inherit
+
+  helm-test:
+    uses: ./.github/workflows/helm-test.yml
+    needs: make-test
+    with:
+      artifact_name: ${{ needs.make-test.outputs.ARTIFACT_NAME }}
+      ACS_VALUES_VERSION: ${{ needs.make-test.outputs.ACS_VALUES_VERSION }}
+      ACS_CHART_VERSION:  ${{ needs.make-test.outputs.ACS_CHART_VERSION }}
+    secrets: inherit  

From 828548f2f0b1c95bcd9be8fcedf1302371e914c2 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 16:34:11 +0200
Subject: [PATCH 14/35] fix

---
 .github/workflows/build_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index c06d2897..fcb33230 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -57,7 +57,7 @@ jobs:
           echo "password ${{ secrets.NEXUS_PASSWORD }}" >> ~/.netrc
 
       - name: Fetch artifacts from nexus
-        run: ./scripts/fetch-artifact.sh
+        run: ./scripts/fetch-artifacts.sh
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

From 99fc99c728d752b71d55c3f84b6e1bedb3ea1da9 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 16:55:36 +0200
Subject: [PATCH 15/35] fix

---
 .github/workflows/build_and_test.yml | 126 ++++++++++++++++++++++++---
 .github/workflows/compose-test.yml   |  43 ---------
 .github/workflows/helm-test.yml      | 110 -----------------------
 .github/workflows/test-make.yml      |  53 +++--------
 4 files changed, 126 insertions(+), 206 deletions(-)
 delete mode 100644 .github/workflows/compose-test.yml
 delete mode 100644 .github/workflows/helm-test.yml

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index fcb33230..dc051e5d 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -100,17 +100,123 @@ jobs:
           compression-level: 0
 
   compose-test:
-    uses: ./.github/workflows/compose-test.yml
+    name: compose-test
     needs: build-test
-    with:
-      artifact_name: ${{ needs.build-test.outputs.ARTIFACT_NAME }}
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db  # v3.6.1
+    
+      - name: Download artifacts
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          path: /tmp
+          name: ${{ env.ARTIFACT_NAME }}
+
+      - name: Load Docker images
+        run: |
+          docker load -i /tmp/${{ env.ARTIFACT_NAME }}.tar
+          docker image ls -a
+
+      - name: Verify docker-compose
+        uses: Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v6.0.1
+        timeout-minutes: 10
+        with:
+          compose_pull: false
+          compose_file_path: test/docker-compose.yml
+          quay_username: ${{ secrets.QUAY_USERNAME }}
+          quay_password: ${{ secrets.QUAY_PASSWORD }}
+
+      - uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v6.0.0
+
 
   helm-test:
-    uses: ./.github/workflows/helm-test.yml
+    name: helm test
     needs: build-test
-    with:
-      artifact_name: ${{ needs.build-test.outputs.ARTIFACT_NAME }}
-      ACS_VALUES_VERSION: ${{ needs.build-test.outputs.ACS_VALUES_VERSION }}
-      ACS_CHART_VERSION:  ${{ needs.build-test.outputs.ACS_CHART_VERSION }}
-    secrets: inherit  
+    runs-on: alfrescoPub-ubuntu2204-16G-4CPU
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          path: /tmp
+          name: ${{ env.ARTIFACT_NAME }}
+
+      - name: Setup cluster
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.35.0
+        with:
+          ingress-nginx-ref: controller-v1.8.2
+          metrics: "true"
+
+      - name: Load Docker images
+        run: |
+          kind load image-archive -n chart-testing /tmp/${{ env.ARTIFACT_NAME }}.tar
+
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
+        with:
+          version: "3.15.2"
+
+      - name: Login to Quay.io
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  # v3.1.0
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      - name: Create registries auth secret
+        run: >-
+          kubectl create secret generic regcred
+          --from-file=.dockerconfigjson=$HOME/.docker/config.json
+          --type=kubernetes.io/dockerconfigjson
+
+      - name: Fetch upstream values for tests
+        run: >-
+          curl -ssfL
+          https://raw.githubusercontent.com/Alfresco/acs-deployment/${{ env.ACS_VALUES_VERSION }}/test/enterprise-integration-test-values.yaml
+          -o test/helm/enterprise-integration-test-values.yaml &&
+          ls -l test/helm/enterprise-integration-test-values.yaml &&
+          cat test/helm/enterprise-integration-test-values.yaml
+
+      - name: Helm install
+        id: helm_install
+        run: |
+          helm repo add alfresco https://kubernetes-charts.alfresco.com/stable
+          helm repo update
+          helm install acs alfresco/alfresco-content-services \
+            --version ${{ env.ACS_CHART_VERSION }} \
+            --set global.search.sharedSecret="$(openssl rand -hex 24)" \
+            --set global.known_urls=http://localhost \
+            --set global.alfrescoRegistryPullSecrets=regcred \
+            --values test/helm/enterprise-integration-test-values.yaml \
+            --values test/helm/test-overrides.yaml
+
+      - name: Watch Helm deployment
+        env:
+          HELM_INSTALL_TIMEOUT: 8m
+        run: |
+          kubectl get pods --watch &
+          KWPID=$!
+          kubectl wait --timeout=${{ env.HELM_INSTALL_TIMEOUT }} --all=true --for=condition=Ready pods
+          kill $KWPID
+          echo "Waiting for ESC Reindexing job to complete... "
+          kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing
+
+      - name: Debug cluster status after install
+        if: always() && steps.helm_install.outcome != 'skipped'
+        run: |
+          helm ls --all-namespaces --all
+          kubectl get all --all-namespaces
+          kubectl describe pod
+
+      - name: Run helm test
+        id: helm_test
+        run: helm test acs
+
+      - name: Debug cluster status after helm test
+        if: always() && steps.helm_test.outcome != 'skipped'
+        run: |
+          kubectl logs -l app.kubernetes.io/component=dtas --tail=-1
+          kubectl get all --all-namespaces
+          kubectl describe pod
diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml
deleted file mode 100644
index b86566b6..00000000
--- a/.github/workflows/compose-test.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Compose Test
-
-on:
-  workflow_call:
-    inputs:
-      ARTIFACT_NAME:
-        required: true
-        type: string
-    secrets:
-      QUAY_PASSWORD:
-        required: true
-      QUAY_USERNAME:
-        required: true
-
-jobs:
-  compose-test:
-    name: compose-test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db  # v3.6.1
-
-      - name: Download artifacts
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          path: /tmp
-          name: ${{ inputs.ARTIFACT_NAME }}
-
-      - name: Load Docker images
-        run: |
-          docker load -i /tmp/${{ inputs.ARTIFACT_NAME }}.tar
-          docker image ls -a
-
-      - name: Verify docker-compose
-        uses: Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v6.0.1
-        timeout-minutes: 10
-        with:
-          compose_pull: false
-          compose_file_path: test/docker-compose.yml
-          quay_username: ${{ secrets.QUAY_USERNAME }}
-          quay_password: ${{ secrets.QUAY_PASSWORD }}
-
-      - uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v6.0.0
diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml
deleted file mode 100644
index 740421fc..00000000
--- a/.github/workflows/helm-test.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: Compose Test
-
-on:
-  workflow_call:
-    inputs:
-      ARTIFACT_NAME:
-        required: true
-        type: string
-      ACS_VALUES_VERSION:
-        required: true
-        type: string
-      ACS_CHART_VERSION:
-        required: true
-        type: string
-    secrets:
-      QUAY_PASSWORD:
-        required: true
-      QUAY_USERNAME:
-        required: true
-
-jobs:
-  helm-test:
-    name: helm test
-    runs-on: alfrescoPub-ubuntu2204-16G-4CPU
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          path: /tmp
-          name: ${{ inputs.ARTIFACT_NAME }}
-
-      - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.35.0
-        with:
-          ingress-nginx-ref: controller-v1.8.2
-          metrics: "true"
-
-      - name: Load Docker images
-        run: |
-          kind load image-archive -n chart-testing /tmp/${{ inputs.ARTIFACT_NAME }}.tar
-
-      - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
-        with:
-          version: "3.15.2"
-
-      - name: Login to Quay.io
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  # v3.1.0
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_PASSWORD }}
-
-      - name: Create registries auth secret
-        run: >-
-          kubectl create secret generic regcred
-          --from-file=.dockerconfigjson=$HOME/.docker/config.json
-          --type=kubernetes.io/dockerconfigjson
-
-      - name: Fetch upstream values for tests
-        run: >-
-          curl -ssfL
-          https://raw.githubusercontent.com/Alfresco/acs-deployment/${{ inputs.ACS_VALUES_VERSION }}/test/enterprise-integration-test-values.yaml
-          -o test/helm/enterprise-integration-test-values.yaml &&
-          ls -l test/helm/enterprise-integration-test-values.yaml &&
-          cat test/helm/enterprise-integration-test-values.yaml
-
-      - name: Helm install
-        id: helm_install
-        run: |
-          helm repo add alfresco https://kubernetes-charts.alfresco.com/stable
-          helm repo update
-          helm install acs alfresco/alfresco-content-services \
-            --version ${{ inputs.ACS_CHART_VERSION }} \
-            --set global.search.sharedSecret="$(openssl rand -hex 24)" \
-            --set global.known_urls=http://localhost \
-            --set global.alfrescoRegistryPullSecrets=regcred \
-            --values test/helm/enterprise-integration-test-values.yaml \
-            --values test/helm/test-overrides.yaml
-
-      - name: Watch Helm deployment
-        env:
-          HELM_INSTALL_TIMEOUT: 8m
-        run: |
-          kubectl get pods --watch &
-          KWPID=$!
-          kubectl wait --timeout=${{ env.HELM_INSTALL_TIMEOUT }} --all=true --for=condition=Ready pods
-          kill $KWPID
-          echo "Waiting for ESC Reindexing job to complete... "
-          kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing
-
-      - name: Debug cluster status after install
-        if: always() && steps.helm_install.outcome != 'skipped'
-        run: |
-          helm ls --all-namespaces --all
-          kubectl get all --all-namespaces
-          kubectl describe pod
-
-      - name: Run helm test
-        id: helm_test
-        run: helm test acs
-
-      - name: Debug cluster status after helm test
-        if: always() && steps.helm_test.outcome != 'skipped'
-        run: |
-          kubectl logs -l app.kubernetes.io/component=dtas --tail=-1
-          kubectl get all --all-namespaces
-          kubectl describe pod
diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index 88ff69e1..9101ccd9 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -10,17 +10,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
   cancel-in-progress: true
 
-env:
-  ACS_CHART_VERSION: 8.3.0
-  ACS_VALUES_VERSION: cfb0d426eff14a8b581c31e61db5e670da09ba3b
-  ARTIFACT_NAME: alfresco-docker-images
-
 jobs:
   make-test:
-    outputs:
-      ARTIFACT_NAME: ${{ env.ARTIFACT_NAME }}
-      ACS_VALUES_VERSION: ${{ env.ACS_VALUES_VERSION }}
-      ACS_CHART_VERSION: ${{ env.ACS_CHART_VERSION }}
     runs-on: ubuntu-latest
     steps:
       - name: Setup nexus authentication
@@ -41,39 +32,15 @@ jobs:
       - name: Make Docker images
         id: make
         run: |
-          make all
-
-      - name: Show all built images
-        run: docker images
+          make all_ci
+          echo "du=$(du -s | cut -f1)" >> $GITHUB_OUTPUT
 
-      - name: Docker save all baked images whose name include `alfresco`
+      - name: Check Images are loaded and artifacts are cleanup
         run: |
-          docker save -o /tmp/${{ env.ARTIFACT_NAME }}.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco)
-
-      - name: Check disk space
-        run: df -h
-        if: always()
-
-      - name: Upload images as artifact and set outputs with envs
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
-        with:
-          name: ${{ env.ARTIFACT_NAME }}
-          path: /tmp/${{ env.ARTIFACT_NAME }}.tar
-          retention-days: 1
-          compression-level: 0
-
-  compose-test:
-    uses: ./.github/workflows/compose-test.yml
-    needs: make-test
-    with:
-      artifact_name: ${{ needs.make-test.outputs.ARTIFACT_NAME }}
-    secrets: inherit
-
-  helm-test:
-    uses: ./.github/workflows/helm-test.yml
-    needs: make-test
-    with:
-      artifact_name: ${{ needs.make-test.outputs.ARTIFACT_NAME }}
-      ACS_VALUES_VERSION: ${{ needs.make-test.outputs.ACS_VALUES_VERSION }}
-      ACS_CHART_VERSION:  ${{ needs.make-test.outputs.ACS_CHART_VERSION }}
-    secrets: inherit  
+          echo -n "Checking images are loaded in local Docker Engine..."
+          docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || echo "No Alfresco image found" && exit 1
+          echo "Checking artifacts clean up worked"
+          if [ ${{ steps.make.outputs.DU }} -lt $(du -s | cut -f1) ]; then
+            echo "Artifacts were not cleaned up"
+            exit 1
+          fi

From 3706297a3199b5fdb77542965142df1aa97db079 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 17:13:10 +0200
Subject: [PATCH 16/35] revert name of step

---
 .github/workflows/build_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index dc051e5d..20e51653 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -91,7 +91,7 @@ jobs:
         run: df -h
         if: always()
 
-      - name: Upload images as artifact and set outputs with envs
+      - name: Upload images as artifact
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: ${{ env.ARTIFACT_NAME }}

From 6f60eb61f3942eca9160eecf7d931f956c9a846f Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 17:13:42 +0200
Subject: [PATCH 17/35] free disk space

---
 .github/workflows/test-make.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index 9101ccd9..19a305dd 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -14,6 +14,8 @@ jobs:
   make-test:
     runs-on: ubuntu-latest
     steps:
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v5.34.0
+
       - name: Setup nexus authentication
         run: |
           echo "machine nexus.alfresco.com" >> ~/.netrc

From cf733dbdcbf1564a493c785d7540665a2f078743 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 13 Aug 2024 17:31:24 +0200
Subject: [PATCH 18/35] add missing connectors inside make

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e4eef370..41333bda 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,13 @@ search_enterprise: prepare_search_enterprise
 	@echo "Building Search Enterprise images"
 	@docker buildx bake --no-cache --progress=plain enterprise-search
 
+connectors: prepare_connectors
+	@echo "Building Connectors images"
+	@docker buildx bake --no-cache --progress=plain connectors
+
 all: docker-bake.hcl prepare_all
 	@echo "Building all images"
 	@docker buildx bake --no-cache --progress=plain
 
-all_ci: repo tengines ats search_enterprise clean
+all_ci: repo tengines ats search_enterprise clean connectors
 	@echo "Building all images using individual targets for Continuous Integration"

From 99b97f9734d37f35c21a4d19810f860d3bc0088d Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 09:27:42 +0200
Subject: [PATCH 19/35] skip checking the artfiacts

---
 .github/workflows/test-make.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index 19a305dd..2d85c25f 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -41,8 +41,3 @@ jobs:
         run: |
           echo -n "Checking images are loaded in local Docker Engine..."
           docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || echo "No Alfresco image found" && exit 1
-          echo "Checking artifacts clean up worked"
-          if [ ${{ steps.make.outputs.DU }} -lt $(du -s | cut -f1) ]; then
-            echo "Artifacts were not cleaned up"
-            exit 1
-          fi

From 4fbbbc67fa9cc13a8c9492f77536e36337fb13ce Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 09:27:50 +0200
Subject: [PATCH 20/35] skip checking the artfiacts

---
 .github/workflows/test-make.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index 2d85c25f..c8bb69e8 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -35,7 +35,6 @@ jobs:
         id: make
         run: |
           make all_ci
-          echo "du=$(du -s | cut -f1)" >> $GITHUB_OUTPUT
 
       - name: Check Images are loaded and artifacts are cleanup
         run: |

From 5ae293f314059f0892d18ad6f221b3e7f30b0edb Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 09:28:41 +0200
Subject: [PATCH 21/35] fix

---
 .github/workflows/test-make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index c8bb69e8..0a7b787b 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -36,7 +36,7 @@ jobs:
         run: |
           make all_ci
 
-      - name: Check Images are loaded and artifacts are cleanup
+      - name: Check Images are loaded
         run: |
           echo -n "Checking images are loaded in local Docker Engine..."
           docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || echo "No Alfresco image found" && exit 1

From 40bce956784f49bd56f6bb5f225a49ac06545e90 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 10:42:53 +0200
Subject: [PATCH 22/35] add missing prepare connectors step

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 41333bda..d157c5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ prepare_search_enterprise: scripts/fetch-artifacts.sh
 	@echo "Fetching all artifacts for Search Enterprise targets"
 	@./scripts/fetch-artifacts.sh search/enterprise
 
+prepare_connectors: scripts/fetch-artifacts.sh
+	@echo "Fetching all artifacts for Connectors targets"
+	@./scripts/fetch-artifacts.sh connector
+
 prepare_all: scripts/fetch-artifacts.sh
 	@echo "Fetching all artifacts"
 	@./scripts/fetch-artifacts.sh

From 6451c67ecbcc90e00b29bfe03b26a04cd87f9186 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 11:01:38 +0200
Subject: [PATCH 23/35] test

---
 .github/workflows/test-make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index 0a7b787b..e798c509 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -39,4 +39,4 @@ jobs:
       - name: Check Images are loaded
         run: |
           echo -n "Checking images are loaded in local Docker Engine..."
-          docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || echo "No Alfresco image found" && exit 1
+          docker images --format "{{.Repository}}:{{.Tag}}" | grep alfresco || { echo "No Alfresco image found"; exit 1; }

From 9c3a8984612cecad0061ee0f4ce90490ee202acb Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 12:26:08 +0200
Subject: [PATCH 24/35] try different type of overriding probes

---
 test/helm/test-overrides.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index 38d35585..c6807960 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -57,7 +57,7 @@ alfresco-connector-ms365:
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
-  livenessProbe: null
+  livenessProbe: {}
   resources:
     requests:
       cpu: "0.01"
@@ -73,7 +73,7 @@ alfresco-connector-msteams:
     tag: latest
   readinessProbe:
     initialDelaySeconds: 120
-  livenessProbe: null
+  livenessProbe: {}
   microsoft:
     app:
       id: admin

From ba908027c6efe9e5e8b64f64bfb87a2a7f27b713 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 12:36:51 +0200
Subject: [PATCH 25/35] test the workaround

---
 test/helm/test-overrides.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index c6807960..dc191e8f 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -54,10 +54,11 @@ alfresco-connector-ms365:
   image:
     repository: localhost/alfresco-ooi-service
     tag: latest
+    internalPort: null
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
-  livenessProbe: {}
+  livenessProbe: null
   resources:
     requests:
       cpu: "0.01"
@@ -71,9 +72,10 @@ alfresco-connector-msteams:
   image:
     repository: localhost/alfresco-ms-teams-service
     tag: latest
+    internalPort: null
   readinessProbe:
     initialDelaySeconds: 120
-  livenessProbe: {}
+  livenessProbe: null
   microsoft:
     app:
       id: admin

From b4d358351d0cf591614eb925c2dab8d5be2fe089 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 13:49:53 +0200
Subject: [PATCH 26/35] try different approach

---
 test/helm/test-overrides.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index dc191e8f..3900ba1e 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -54,11 +54,11 @@ alfresco-connector-ms365:
   image:
     repository: localhost/alfresco-ooi-service
     tag: latest
-    internalPort: null
+    internalPort: []
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
-  livenessProbe: null
+  livenessProbe: {}
   resources:
     requests:
       cpu: "0.01"
@@ -72,10 +72,10 @@ alfresco-connector-msteams:
   image:
     repository: localhost/alfresco-ms-teams-service
     tag: latest
-    internalPort: null
+    internalPort: []
   readinessProbe:
     initialDelaySeconds: 120
-  livenessProbe: null
+  livenessProbe: {}
   microsoft:
     app:
       id: admin

From 938339a3620e7e3f8637ad0ec6545d6f249ac2a1 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 14:04:18 +0200
Subject: [PATCH 27/35] test

---
 test/helm/test-overrides.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index 3900ba1e..eb2dece4 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -54,7 +54,7 @@ alfresco-connector-ms365:
   image:
     repository: localhost/alfresco-ooi-service
     tag: latest
-    internalPort: []
+    internalPort: null
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
@@ -72,7 +72,7 @@ alfresco-connector-msteams:
   image:
     repository: localhost/alfresco-ms-teams-service
     tag: latest
-    internalPort: []
+    internalPort: null
   readinessProbe:
     initialDelaySeconds: 120
   livenessProbe: {}

From cc3ebe1c7c30fc58202f084a226bc05127e6b33b Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 17:15:27 +0200
Subject: [PATCH 28/35] test alpha

---
 .github/workflows/build_and_test.yml | 25 +++++++++++++++++++------
 test/helm/test-overrides.yaml        |  6 ++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 269de30f..a4c6a799 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -15,8 +15,8 @@ on:
       - '.github/workflows/test-make.yml'
 
 env:
-  ACS_CHART_VERSION: 8.3.0
-  ACS_VALUES_VERSION: cfb0d426eff14a8b581c31e61db5e670da09ba3b
+  ACS_CHART_VERSION: 172410cfb4ad44d4839d9aefd31b4bcefc44f316
+  ACS_VALUES_VERSION: 172410cfb4ad44d4839d9aefd31b4bcefc44f316
   ARTIFACT_NAME: alfresco-docker-images
 
 concurrency:
@@ -179,13 +179,26 @@ jobs:
           ls -l test/helm/enterprise-integration-test-values.yaml &&
           cat test/helm/enterprise-integration-test-values.yaml
 
+      - name: Checkout github source
+        uses: actions/checkout@v4
+        with:
+          repository: Alfresco/acs-deployment
+          ref: ${{ env.ACS_CHART_VERSION }} 
+          path: github-source
+
+      - name: Setup helm repository
+        working-directory: github-source/helm/alfresco-content-services
+        run: |
+          helm repo add self https://alfresco.github.io/alfresco-helm-charts/
+          helm repo add activiti https://activiti.github.io/activiti-cloud-helm-charts
+          helm repo add bitnami https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/
+          helm repo add elastic https://helm.elastic.co
+          helm dependency build
+
       - name: Helm install
         id: helm_install
         run: |
-          helm repo add alfresco https://kubernetes-charts.alfresco.com/stable
-          helm repo update
-          helm install acs alfresco/alfresco-content-services \
-            --version ${{ env.ACS_CHART_VERSION }} \
+          helm install acs ./github-source/helm/alfresco-content-services \
             --set global.search.sharedSecret="$(openssl rand -hex 24)" \
             --set global.known_urls=http://localhost \
             --set global.alfrescoRegistryPullSecrets=regcred \
diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index eb2dece4..38d35585 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -54,11 +54,10 @@ alfresco-connector-ms365:
   image:
     repository: localhost/alfresco-ooi-service
     tag: latest
-    internalPort: null
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
-  livenessProbe: {}
+  livenessProbe: null
   resources:
     requests:
       cpu: "0.01"
@@ -72,10 +71,9 @@ alfresco-connector-msteams:
   image:
     repository: localhost/alfresco-ms-teams-service
     tag: latest
-    internalPort: null
   readinessProbe:
     initialDelaySeconds: 120
-  livenessProbe: {}
+  livenessProbe: null
   microsoft:
     app:
       id: admin

From 85e99e33fee6cd9e7cf030d13c28e25e5ba2ad6a Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Mon, 19 Aug 2024 17:33:16 +0200
Subject: [PATCH 29/35] disable different way

---
 test/helm/test-overrides.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index 38d35585..c6807960 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -57,7 +57,7 @@ alfresco-connector-ms365:
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
-  livenessProbe: null
+  livenessProbe: {}
   resources:
     requests:
       cpu: "0.01"
@@ -73,7 +73,7 @@ alfresco-connector-msteams:
     tag: latest
   readinessProbe:
     initialDelaySeconds: 120
-  livenessProbe: null
+  livenessProbe: {}
   microsoft:
     app:
       id: admin

From 9666e5e813372e6876323c43168bb8d677f35bc8 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 20 Aug 2024 09:42:08 +0200
Subject: [PATCH 30/35] try ussing set

---
 .github/workflows/build_and_test.yml | 4 +++-
 test/helm/test-overrides.yaml        | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index a4c6a799..2c992424 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -203,7 +203,9 @@ jobs:
             --set global.known_urls=http://localhost \
             --set global.alfrescoRegistryPullSecrets=regcred \
             --values test/helm/enterprise-integration-test-values.yaml \
-            --values test/helm/test-overrides.yaml
+            --values test/helm/test-overrides.yaml \
+            --set alfresco-connector-ms365.livenessProbe=null \
+            --set alfresco-connector-msteams.livenessProbe=null \
 
       - name: Watch Helm deployment
         env:
diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index c6807960..8cc664ac 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -57,7 +57,6 @@ alfresco-connector-ms365:
   environment:
     ALFRESCO_ADMIN_PASSWORD: admin
     ALFRESCO_ADMIN_USERNAME: admin
-  livenessProbe: {}
   resources:
     requests:
       cpu: "0.01"
@@ -71,9 +70,6 @@ alfresco-connector-msteams:
   image:
     repository: localhost/alfresco-ms-teams-service
     tag: latest
-  readinessProbe:
-    initialDelaySeconds: 120
-  livenessProbe: {}
   microsoft:
     app:
       id: admin

From 2cd5abc959829d291d0823279c8d075db2776a14 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 20 Aug 2024 09:42:33 +0200
Subject: [PATCH 31/35] try ussing set

---
 .github/workflows/build_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 2c992424..1322eac1 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -205,7 +205,7 @@ jobs:
             --values test/helm/enterprise-integration-test-values.yaml \
             --values test/helm/test-overrides.yaml \
             --set alfresco-connector-ms365.livenessProbe=null \
-            --set alfresco-connector-msteams.livenessProbe=null \
+            --set alfresco-connector-msteams.livenessProbe=null 
 
       - name: Watch Helm deployment
         env:

From a2a8a5c586c997154249019eb4a8448454e73744 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 20 Aug 2024 10:14:13 +0200
Subject: [PATCH 32/35] Remove connectors - will be tested on tf-pipeline

---
 .github/workflows/build_and_test.yml |  4 +---
 test/helm/test-overrides.yaml        | 33 ----------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1322eac1..a4c6a799 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -203,9 +203,7 @@ jobs:
             --set global.known_urls=http://localhost \
             --set global.alfrescoRegistryPullSecrets=regcred \
             --values test/helm/enterprise-integration-test-values.yaml \
-            --values test/helm/test-overrides.yaml \
-            --set alfresco-connector-ms365.livenessProbe=null \
-            --set alfresco-connector-msteams.livenessProbe=null 
+            --values test/helm/test-overrides.yaml
 
       - name: Watch Helm deployment
         env:
diff --git a/test/helm/test-overrides.yaml b/test/helm/test-overrides.yaml
index 8cc664ac..8fc01078 100644
--- a/test/helm/test-overrides.yaml
+++ b/test/helm/test-overrides.yaml
@@ -48,39 +48,6 @@ alfresco-transform-service:
       repository: localhost/alfresco-shared-file-store
       tag: latest
 #alfresco-sync-service:
-alfresco-connector-ms365:
-  enabled: true
-  replicaCount: 1
-  image:
-    repository: localhost/alfresco-ooi-service
-    tag: latest
-  environment:
-    ALFRESCO_ADMIN_PASSWORD: admin
-    ALFRESCO_ADMIN_USERNAME: admin
-  resources:
-    requests:
-      cpu: "0.01"
-      memory: "256Mi"
-    limits:
-      cpu: "2"
-      memory: "512Mi"
-alfresco-connector-msteams:
-  enabled: true
-  replicaCount: 1
-  image:
-    repository: localhost/alfresco-ms-teams-service
-    tag: latest
-  microsoft:
-    app:
-      id: admin
-      password: admin
-  resources:
-    requests:
-      cpu: "0.01"
-      memory: "256Mi"
-    limits:
-      cpu: "2"
-      memory: "512Mi"
 dtas:
   additionalArgs:
     - --tb=short

From 2adc3fd06a283d378d8ad9430579d0d8a2915ce0 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 20 Aug 2024 10:16:35 +0200
Subject: [PATCH 33/35] remove outputs

---
 .github/workflows/build_and_test.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index a4c6a799..905c026a 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -40,10 +40,6 @@ jobs:
   build-test:
     runs-on: ubuntu-latest
     needs: pre-commit
-    outputs:
-      ARTIFACT_NAME: ${{ env.ARTIFACT_NAME }}
-      ACS_VALUES_VERSION: ${{ env.ACS_VALUES_VERSION }}
-      ACS_CHART_VERSION: ${{ env.ACS_CHART_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

From b0c6b16910266104d00ce25607db22632f22a259 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 20 Aug 2024 17:11:49 +0200
Subject: [PATCH 34/35] Review comments

---
 .github/workflows/build_and_test.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 905c026a..f051998b 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -16,7 +16,6 @@ on:
 
 env:
   ACS_CHART_VERSION: 172410cfb4ad44d4839d9aefd31b4bcefc44f316
-  ACS_VALUES_VERSION: 172410cfb4ad44d4839d9aefd31b4bcefc44f316
   ARTIFACT_NAME: alfresco-docker-images
 
 concurrency:
@@ -167,15 +166,7 @@ jobs:
           --from-file=.dockerconfigjson=$HOME/.docker/config.json
           --type=kubernetes.io/dockerconfigjson
 
-      - name: Fetch upstream values for tests
-        run: >-
-          curl -ssfL
-          https://raw.githubusercontent.com/Alfresco/acs-deployment/${{ env.ACS_VALUES_VERSION }}/test/enterprise-integration-test-values.yaml
-          -o test/helm/enterprise-integration-test-values.yaml &&
-          ls -l test/helm/enterprise-integration-test-values.yaml &&
-          cat test/helm/enterprise-integration-test-values.yaml
-
-      - name: Checkout github source
+      - name: Checkout acs-deployment sources
         uses: actions/checkout@v4
         with:
           repository: Alfresco/acs-deployment
@@ -198,7 +189,7 @@ jobs:
             --set global.search.sharedSecret="$(openssl rand -hex 24)" \
             --set global.known_urls=http://localhost \
             --set global.alfrescoRegistryPullSecrets=regcred \
-            --values test/helm/enterprise-integration-test-values.yaml \
+            --values ./github-source/test/enterprise-integration-test-values.yaml \
             --values test/helm/test-overrides.yaml
 
       - name: Watch Helm deployment

From 7f4deafa4f0546b8504f91a2066c1d1169ff0d25 Mon Sep 17 00:00:00 2001
From: pmacius <pawel.maciusiak@hyland.com>
Date: Tue, 20 Aug 2024 17:43:42 +0200
Subject: [PATCH 35/35] uniform

---
 .github/workflows/test-make.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/test-make.yml b/.github/workflows/test-make.yml
index e798c509..ce8a8d39 100644
--- a/.github/workflows/test-make.yml
+++ b/.github/workflows/test-make.yml
@@ -2,6 +2,14 @@ name: Test building using the make wrapper
 
 on:
   push:
+    branches:
+      - main
+    paths:
+      - 'Makefile'
+      - '.github/workflows/test-make.yml'
+  pull_request:
+    branches:
+      - main
     paths:
       - 'Makefile'
       - '.github/workflows/test-make.yml'