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