feat: Integrate infrastructure repository into e2e process (#115)

Author: adskyiproger

.github/workflows/deploy-and-e2e.yml

@@ -22,6 +22,10 @@ on:
         required: false
         default: false
         type: boolean
+      chart-branch:
+        description: Helm chart version to deploy
+        required: false
+        default: 'develop'
       branch:
         description: e2e branch
         required: false
@@ -140,6 +144,7 @@ jobs:
       countryconfig-image-tag: ${{ github.event.client_payload.countryconfig-image-tag || inputs.countryconfig-image-tag }}
       environment: ${{ github.event.client_payload.stack || inputs.stack }}
       reset: ${{ github.event.client_payload.reset || inputs.reset || true }}
+      chart-branch: ${{ github.event.client_payload.chart-branch || inputs.chart-branch }}
       keep-e2e: ${{ github.event.client_payload.keep-e2e == 'true' || github.event.client_payload.keep-e2e == true || inputs.keep-e2e || false }}
     secrets: inherit
   test:

.github/workflows/k8s-deploy.yml

@@ -7,6 +7,8 @@ on:
         type: string
       countryconfig-image-tag:
         type: string
+      chart-branch:
+        type: string
       environment:
         type: string
       reset:
@@ -24,6 +26,10 @@ on:
         description: 'Tag of the countryconfig image'
         required: true
         default: 'develop'
+      chart-branch:
+        description: 'Helm chart version to deploy'
+        required: false
+        default: 'develop'
       environment:
         description: 'Target environment'
         required: true
@@ -47,9 +53,18 @@ jobs:
       COUNTRYCONFIG_IMAGE_TAG: ${{ inputs.countryconfig-image-tag }}
     runs-on: [self-hosted, k8s, e2e]
     steps:
-      # FYI: Repository is needed only due to single file: examples/dev/opencrvs-services/values.yaml
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+      # FIXME: Update to charts repository once available
+      - name: Checkout infrastructure repository
+        uses: actions/checkout@v5
+        with:
+          repository: opencrvs/infrastructure
+          path: infrastructure
+          ref: ${{ inputs.chart-branch }}
+      - name: Verify branch status ${{ inputs.chart-branch }}
+        working-directory: infrastructure
+        run: git status
       - name: Generate summary
         run: |
           echo "Deploying environment to https://${{ inputs.environment }}.e2e-k8s.${{ vars.DOMAIN }}" >> $GITHUB_STEP_SUMMARY
@@ -98,7 +113,7 @@ jobs:
           sed -i -e "s#{{STACK}}#${ENV}#g" k8s-env/opencrvs/values.yaml
       - name: Deploy with Helm
         run: |
-          helm upgrade --install opencrvs oci://ghcr.io/opencrvs/opencrvs-services:0.1.23 \
+          helm upgrade --install opencrvs infrastructure/charts/opencrvs-services \
             --timeout 15m \
             --namespace "opencrvs-${ENV}" \
             -f k8s-env/opencrvs/values.yaml \
@@ -108,6 +123,9 @@ jobs:
             --set countryconfig.image.tag="$COUNTRYCONFIG_IMAGE_TAG" \
             --set hostname=$ENV.e2e-k8s.opencrvs.dev \
             --set environment="$ENV" 2>&1 | sed '/USER-SUPPLIED VALUES:/,$d'; exit ${PIPESTATUS[0]};
+      - name: Get notes from Helm release
+        run: |
+          helm get notes opencrvs -n "opencrvs-${ENV}" || echo "No notes found"
       - name: Add keep namespace label opencrvs-${ENV}
         if: inputs.keep-e2e
         run: kubectl label namespace opencrvs-${ENV} keep_namespace='true' --overwrite