chore: use directory-based structure (#1895) - follow-up

Signed-off-by: Ahmed AbouZaid <[email protected]>

.github/actions/workflow-vars/action.yml

@@ -14,6 +14,8 @@ inputs:
     description: The deployment cloud platform like GKE or ROSA.
   identifier-base:
     description: The fixed string in the identifier of the deployment it could be PR number or another specified name.
+  chart-dir:
+    description: A reference for the Camunda Helm chart directory which allows to test unreleased chagnes from Git repo.
 # NOTE: This is not an exclusive list, some vars are exported as env var not an output.
 outputs:
   identifier:
@@ -82,8 +84,11 @@ runs:
 
       # Chart version.
       # Used to install previous supported versions of Camunda Helm charts.
-      TEST_CHART_VERSION="$(yq '.version' charts/${CI_CHART_DIR}/Chart.yaml)"
-      echo "TEST_CHART_VERSION=${TEST_CHART_VERSION}" | tee -a $GITHUB_ENV
+      # This is only needed in the upgrade flow not the setup.
+      if [[ "${{ inputs.setup-flow }}" == 'upgrade' ]]; then
+        TEST_CHART_VERSION="$(yq '.version' charts/${{ inputs.chart-dir }}/Chart.yaml)"
+        echo "TEST_CHART_VERSION=${TEST_CHART_VERSION}" | tee -a $GITHUB_ENV
+      fi
 
     # Avoid confusion about the chart version since we only change the version during the release process
     # as the "version" field in "Chart.yaml" file doesn't reflect the changes since the latest release.

.github/renovate.json5

@@ -25,6 +25,13 @@
       // "addLabels": ["automerge"],
       // "automerge": true
     },
+    {
+      "matchPaths": [
+        "charts/camunda-platform*/Chart.yaml",
+        "charts/camunda-platform*/values*.yaml"
+      ],
+      "matchUpdateTypes": ["patch"],
+    },
     {
       // Disable major version update for all Helm components.
       "enabled": false,

.github/workflows/renovate-post-upgrade.yaml

@@ -33,7 +33,7 @@ jobs:
         token: '${{ steps.generate-github-token.outputs.token }}'
     - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
       with:
-        go-version-file: go.mod
+        go-version-file: charts/camunda-platform/go.mod
         cache: false
     - uses: asdf-vm/actions/setup@05e0d2ed97b598bfce82fd30daf324ae0c4570e6 # v3
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4

.github/workflows/test-integration-template.yaml

@@ -57,7 +57,6 @@ env:
   # Vars with "TEST_" prefix are used in the test runner tool (Task).
   CI_PERSISTENT: ${{ inputs.persistent }}
   CI_HOSTNAME_BASE: ci.distro.ultrawombat.com
-  CI_CHART_DIR: ${{ inputs.camunda-helm-dir }}
   CI_SCENARIOS_DIR: charts/${{ inputs.camunda-helm-dir }}/test/integration/scenarios
   # Docker Hub auth to avoid image pull rate limit.
   TEST_CREATE_DOCKER_LOGIN_SECRET: "TRUE"
@@ -171,6 +170,7 @@ jobs:
         platform: ${{ matrix.distro.platform }}
         identifier-base: ${{ inputs.identifier }}
         ingress-hostname-base: ${{ env.CI_HOSTNAME_BASE }}
+        chart-dir: ${{ inputs.camunda-helm-dir }}
     - name: Install env dependencies
       uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6 # v3
     - name: Add Helm repos and dependencies

charts/camunda-platform-8.2/test/integration/scenarios/chart-full-setup/Taskfile.yaml

@@ -43,7 +43,7 @@ tasks:
     deps: [init.seed]
     cmds:
     - helm install integration {{ .CHART_DIR }}
-        --version {{ .TEST_CHART_VERSION | default ">0.0.0" }}
+        --version {{ .TEST_CHART_VERSION | default ">0.0.0" | quote }}
         --namespace {{ .TEST_NAMESPACE }}
         --values {{ .FIXTURES_DIR }}/values-integration-test.yaml
         --values ./values-integration-test-ingress.yaml

charts/camunda-platform-8.3/test/integration/scenarios/chart-full-setup/Taskfile.yaml

@@ -59,7 +59,7 @@ tasks:
     deps: [init.seed]
     cmds:
     - helm install integration {{ .TEST_CHART_NAME }}
-        --version {{ .TEST_CHART_VERSION | default ">0.0.0" }}
+        --version {{ .TEST_CHART_VERSION | default ">0.0.0" | quote }}
         --namespace {{ .TEST_NAMESPACE }}
         --values {{ .FIXTURES_DIR }}/values-integration-test.yaml
         --values ./values-integration-test-ingress.yaml