ocr-service

pucardotorg · Oct 15, 2024 · d58ccd3 · d58ccd3
1 parent b736a7e
commit d58ccd3
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 122 deletions.
diff --git a/.github/workflows/solutions-dev.yaml b/.github/workflows/solutions-dev.yaml
@@ -1,8 +1,8 @@
 name: Pucar-Install Workflow Solutins-Dev
 on:
-  push:
-   branches:
-     - Solutions-Pipeline
+#  push:
+#   branches:
+#     - Solutions-Pipeline
 #  pull_request:
 #    branches:
 #      - main

diff --git a/.github/workflows/solutions-dpg-qa.yaml b/.github/workflows/solutions-dpg-qa.yaml
@@ -1,8 +1,8 @@
 name: Pucar-Install Workflow Solutins-dpg-qa
 on:
-#  push:
-#   branches:
-#     - Solutions-Pipeline
+  push:
+   branches:
+     - Solutions-Pipeline
 #  pull_request:
 #    branches:
 #      - main
@@ -149,121 +149,70 @@ jobs:
           helmfile-version: 'v0.150.0'
           helm-plugins: >
             https://github.com/databus23/helm-diff
-
-      - name: Commit Id for Latest Deployment
+      - name: Parse YAML and export as environment variables
+        id: set-env
         run: |
-          git clone https://github.com/pucardotorg/dristi-solutions.git
-          cd dristi-solutions
-          git checkout tags/v0.3.3-uat
-          payment_calculator_commit=$(git log -1 --pretty=format:%H -- backend/payment-calculator-svc)
-          echo "payment_calculator_commit=$payment_calculator_commit" >> $GITHUB_ENV
-          advocate_commit=$(git log -1 --pretty=format:%H -- backend/advocate)
-          echo "advocate_commit=$advocate_commit" >> $GITHUB_ENV
-          case_commit=$(git log -1 --pretty=format:%H -- backend/case)
-          echo "case_commit=$case_commit" >> $GITHUB_ENV
-          casemanagement_commit=$(git log -1 --pretty=format:%H -- backend/casemanagement)
-          echo "casemanagement_commit=$casemanagement_commit" >> $GITHUB_ENV
-          hearing_commit=$(git log -1 --pretty=format:%H -- backend/hearing)
-          echo "hearing_commit=$hearing_commit" >> $GITHUB_ENV
-          dristi_case_pdf_commit=$(git log -1 --pretty=format:%H -- backend/dristi-case-pdf)
-          echo "dristi_case_pdf_commit=$dristi_case_pdf_commit" >> $GITHUB_ENV
-          esign_interceptor_commit=$(git log -1 --pretty=format:%H -- backend/esign-interceptor)
-          echo "esign_interceptor_commit=$esign_interceptor_commit" >> $GITHUB_ENV
-          esign_svc_commit=$(git log -1 --pretty=format:%H -- backend/e-sign-svc)
-          echo "esign_svc_commit=$esign_svc_commit" >> $GITHUB_ENV     
-          epost_tracker_commit=$(git log -1 --pretty=format:%H -- backend/epost-tracker)
-          echo "epost_tracker_commit=$epost_tracker_commit" >> $GITHUB_ENV  
-          transformer_commit=$(git log -1 --pretty=format:%H -- backend/transformer)
-          echo "transformer_commit=$transformer_commit" >> $GITHUB_ENV  
-          order_commit=$(git log -1 --pretty=format:%H -- backend/order)
-          echo "order_commit=$order_commit" >> $GITHUB_ENV
-          evidence_commit=$(git log -1 --pretty=format:%H -- backend/evidence)
-          echo "evidence_commit=$evidence_commit" >> $GITHUB_ENV
-          application_commit=$(git log -1 --pretty=format:%H -- backend/application)
-          echo "application_commit=$application_commit" >> $GITHUB_ENV      
-          scheduler_commit=$(git log -1 --pretty=format:%H -- backend/scheduler-svc)
-          echo "scheduler_commit=$scheduler_commit" >> $GITHUB_ENV
-          summons_svc_commit=$(git log -1 --pretty=format:%H -- backend/summons-svc)
-          echo "summons_svc_commit=$summons_svc_commit" >> $GITHUB_ENV 
-          collection_service_commit=$(git log -1 --pretty=format:%H -- common/collection-services)
-          echo "collection_service_commit=$collection_service_commit" >> $GITHUB_ENV
-          task_commit=$(git log -1 --pretty=format:%H -- backend/task)
-          echo "task_commit=$task_commit" >> $GITHUB_ENV
-          digit_ui_commit=$(git log -1 --pretty=format:%H -- frontend/micro-ui)
-          echo "digit_ui_commit=$digit_ui_commit" >> $GITHUB_ENV
-          analytics_commit=$(git log -1 --pretty=format:%H -- backend/analytics)
-          echo "analytics_commit=$analytics_commit" >> $GITHUB_ENV 
-          individual_commit=$(git log -1 --pretty=format:%H -- common/individual)
-          echo "individual_commit=$individual_commit" >> $GITHUB_ENV
-          inbox_commit=$(git log -1 --pretty=format:%H -- common/inbox)
-          echo "inbox_commit=$inbox_commit" >> $GITHUB_ENV
-          etreasury_commit=$(git log -1 --pretty=format:%H -- backend/treasury-backend)
-          echo "etreasury_commit=$etreasury_commit" >> $GITHUB_ENV
-          epayment_commit=$(git log -1 --pretty=format:%H -- backend/treasury-webpage)
-          echo "epayment_commit=$epayment_commit" >> $GITHUB_ENV
-          sbi_svc_commit=$(git log -1 --pretty=format:%H -- backend/sbi-backend)
-          echo "sbi_svc_commit=$sbi_svc_commit" >> $GITHUB_ENV
-          sbi_ui_commit=$(git log -1 --pretty=format:%H -- backend/sbi-webpage)
-          echo "sbi_ui_commit=$sbi_ui_commit" >> $GITHUB_ENV
-          integration_commit=$(git log -1 --pretty=format:%H -- backend/icops_integration-kerala)
-          echo "integration_commit=$integration_commit" >> $GITHUB_ENV
-          kerala_sms_commit=$(git log -1 --pretty=format:%H -- backend/kerala-sms)
-          echo "kerala_sms_commit=$kerala_sms_commit" >> $GITHUB_ENV
-          billing_service_commit=$(git log -1 --pretty=format:%H -- common/billing-service)
-          echo "billing_service_commit=$billing_service_commit" >> $GITHUB_ENV
-          dristi_pdf_commit=$(git log -1 --pretty=format:%H -- utilities/dristi-pdf)
-          echo "dristi_pdf_commit=$dristi_pdf_commit" >> $GITHUB_ENV
-
+          services=$(yq e '.modules[] | select(.name == "egov") | .services' deploy-as-code/charts/release-chart/dependancy_chart-pucar-v0.3.yaml)
+          
+          # Iterate over each service and export as environment variables
+          echo "$services" | while IFS=":" read -r key value; do
+            # Clean up key and value
+            key=$(echo $key | xargs)
+            value=$(echo $value | xargs)
+          
+            # Export as environment variable
+            echo "${key}=${value}" >> $GITHUB_ENV
+          done
 
       - name: digit deployment
         run: |
           helmfile -l deployment=pucar -f digit-helmfile.yaml apply --include-needs=true \
-           --set scheduler.image.tag=v1.0.0-${{ env.scheduler_commit }} \
-           --set scheduler.initContainers.dbMigration.image.tag=v1.0.0-${{ env.scheduler_commit }} \
-           --set payment-calculator.image.tag=v1.0.0-${{ env.payment_calculator_commit }} \
-           --set payment-calculator.initContainers.dbMigration.image.tag=v1.0.0-${{ env.payment_calculator_commit }} \
-           --set digit-ui.image.tag=v1.0.0-${{ env.digit_ui_commit }} \
-           --set dristi-case-pdf.image.tag=v1.0.0-${{ env.dristi_case_pdf_commit }} \
-           --set dristi-pdf.image.tag=v1.0.0-${{ env.dristi_pdf_commit }} \
-           --set advocate.image.tag=v1.0.0-${{ env.advocate_commit }} \
-           --set advocate.initContainers.dbMigration.image.tag=v1.0.0-${{ env.advocate_commit }} \
-           --set case.image.tag=v1.0.0-${{ env.case_commit }} \
-           --set case.initContainers.dbMigration.image.tag=v1.0.0-${{ env.case_commit }} \
-           --set casemanagement.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
-           --set casemanagement.initContainers.dbMigration.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
-           --set evidence.image.tag=v1.0.0-${{ env.evidence_commit }} \
-           --set evidence.initContainers.dbMigration.image.tag=v1.0.0-${{ env.evidence_commit }} \
-           --set hearing.image.tag=v1.0.0-${{ env.hearing_commit }} \
-           --set hearing.initContainers.dbMigration.image.tag=v1.0.0-${{ env.hearing_commit }} \
-           --set order.image.tag=v1.0.0-${{ env.order_commit }} \
-           --set order.initContainers.dbMigration.image.tag=v1.0.0-${{ env.order_commit }} \
-           --set task.image.tag=v1.0.0-${{ env.task_commit }} \
-           --set task.initContainers.dbMigration.image.tag=v1.0.0-${{ env.task_commit }} \
-           --set billing-service.image.tag=v1.0.0-${{ env.billing_service_commit }} \
-           --set billing-service.initContainers.dbMigration.image.tag=v1.0.0-${{ env.billing_service_commit }} \
-           --set collection-services.image.tag=v1.0.0-${{ env.collection_service_commit }} \
-           --set collection-services.initContainers.dbMigration.image.tag=v1.0.0-${{ env.collection_service_commit }} \
-           --set individual.image.tag=v1.0.0-${{ env.individual_commit }} \
-           --set individual.initContainers.dbMigration.image.tag=v1.0.0-${{ env.individual_commit }} \
-           --set inbox.image.tag=v1.0.0-${{ env.inbox_commit }} \
-           --set e-sign-svc.image.tag=v1.0.0-${{ env.esign_svc_commit }} \
-           --set esign-interceptor.image.tag=v1.0.0-${{ env.esign_interceptor_commit }} \
-           --set application.image.tag=v1.0.0-${{ env.application_commit }} \
-           --set application.initContainers.dbMigration.image.tag=v1.0.0-${{ env.application_commit }} \
-           --set analytics.image.tag=v1.0.0-${{ env.analytics_commit }} \
-           --set epayments.image.tag=v1.0.0-${{ env.epayment_commit }} \
-           --set etreasury.image.tag=v1.0.0-${{ env.etreasury_commit }} \
-           --set etreasury.initContainers.dbMigration.image.tag=v1.0.0-${{ env.etreasury_commit }} \
-           --set sbi-webpage.image.tag=v1.0.0-${{ env.sbi_ui_commit }} \
-           --set sbi-svc.image.tag=v1.0.0-${{ env.sbi_svc_commit }} \
-           --set sbi-svc.initContainers.dbMigration.image.tag=v1.0.0-${{ env.sbi_svc_commit }} \
-           --set epost-tracker.image.tag=v1.0.0-${{ env.epost_tracker_commit }} \
+           --set scheduler.image.tag=v1.0.0-${{ env.scheduler }} \
+           --set scheduler.initContainers.dbMigration.image.tag=v1.0.0-${{ env.scheduler }} \
+           --set payment-calculator.image.tag=v1.0.0-${{ env.payment-calculator }} \
+           --set payment-calculator.initContainers.dbMigration.image.tag=v1.0.0-${{ env.payment-calculator }} \
+           --set digit-ui.image.tag=v1.0.0-${{ env.digit-ui }} \
+           --set dristi-case-pdf.image.tag=v1.0.0-${{ env.dristi-case-pdf }} \
+           --set dristi-pdf.image.tag=v1.0.0-${{ env.dristi-case-pdf }} \
+           --set advocate.image.tag=v1.0.0-${{ env.advocate }} \
+           --set advocate.initContainers.dbMigration.image.tag=v1.0.0-${{ env.advocate }} \
+           --set case.image.tag=v1.0.0-${{ env.case }} \
+           --set case.initContainers.dbMigration.image.tag=v1.0.0-${{ env.case }} \
+           --set casemanagement.image.tag=v1.0.0-${{ env.casemanagement }} \
+           --set casemanagement.initContainers.dbMigration.image.tag=v1.0.0-${{ env.casemanagement }} \
+           --set evidence.image.tag=v1.0.0-${{ env.evidence }} \
+           --set evidence.initContainers.dbMigration.image.tag=v1.0.0-${{ env.evidence }} \
+           --set hearing.image.tag=v1.0.0-${{ env.hearing }} \
+           --set hearing.initContainers.dbMigration.image.tag=v1.0.0-${{ env.hearing }} \
+           --set order.image.tag=v1.0.0-${{ env.order }} \
+           --set order.initContainers.dbMigration.image.tag=v1.0.0-${{ env.order }} \
+           --set task.image.tag=v1.0.0-${{ env.task }} \
+           --set task.initContainers.dbMigration.image.tag=v1.0.0-${{ env.task }} \
+           --set billing-service.image.tag=v1.0.0-${{ env.billing-service }} \
+           --set billing-service.initContainers.dbMigration.image.tag=v1.0.0-${{ env.billing-service }} \
+           --set collection-services.image.tag=v1.0.0-${{ env.collection-services }} \
+           --set collection-services.initContainers.dbMigration.image.tag=v1.0.0-${{ env.collection-services }} \
+           --set individual.image.tag=v1.0.0-${{ env.individual }} \
+           --set individual.initContainers.dbMigration.image.tag=v1.0.0-${{ env.individual }} \
+           --set inbox.image.tag=v1.0.0-${{ env.inbox }} \
+           --set e-sign-svc.image.tag=v1.0.0-${{ env.e-sign-svc }} \
+           --set esign-interceptor.image.tag=v1.0.0-${{ env.esign-interceptor }} \
+           --set application.image.tag=v1.0.0-${{ env.application }} \
+           --set application.initContainers.dbMigration.image.tag=v1.0.0-${{ env.application }} \
+           --set analytics.image.tag=v1.0.0-${{ env.analytics }} \
+           --set epayments.image.tag=v1.0.0-${{ env.epayments }} \
+           --set etreasury.image.tag=v1.0.0-${{ env.etreasury }} \
+           --set etreasury.initContainers.dbMigration.image.tag=v1.0.0-${{ env.etreasury }} \
+           --set sbi-webpage.image.tag=v1.0.0-${{ env.sbi-webpage }} \
+           --set sbi-svc.image.tag=v1.0.0-${{ env.sbi-svc }} \
+           --set sbi-svc.initContainers.dbMigration.image.tag=v1.0.0-${{ env.sbi-svc }} \
+           --set epost-tracker.image.tag=v1.0.0-${{ env.epost-tracker }} \
            --set epost-tracker.initContainers.dbMigration.image.tag=v1.0.0-${{ env.epost_tracker_commit }} \
-           --set summons-svc.image.tag=v1.0.0-${{ env.summons_svc_commit }} \
-           --set summons-svc.initContainers.dbMigration.image.tag=v1.0.0-${{ env.summons_svc_commit }} \
-           --set transformer.image.tag=v1.0.0-${{ env.transformer_commit }} \
-           --set icops-integration.image.tag=v1.0.0-${{ env.integration_commit }} \
-           --set icops-integration.initContainers.dbMigration.image.tag=v1.0.0-${{ env.integration_commit }}  
+           --set summons-svc.image.tag=v1.0.0-${{ env.summons-svc }} \
+           --set summons-svc.initContainers.dbMigration.image.tag=v1.0.0-${{ env.summons-svc }} \
+           --set transformer.image.tag=v1.0.0-${{ env.transformer }} \
+           --set icops-integration.image.tag=v1.0.0-${{ env.icops-integration }} \
+           --set icops-integration.initContainers.dbMigration.image.tag=v1.0.0-${{ env.icops-integration }}
 
         working-directory: deploy-as-code
         env:

diff --git a/.github/workflows/solutions-qa.yaml b/.github/workflows/solutions-qa.yaml
@@ -199,6 +199,8 @@ jobs:
           echo "individual_commit=$individual_commit" >> $GITHUB_ENV
           inbox_commit=$(git log -1 --pretty=format:%H -- common/inbox)
           echo "inbox_commit=$inbox_commit" >> $GITHUB_ENV
+          ocr_service_commit=$(git log -1 --pretty=format:%H -- backend/ocr-service)
+          echo "ocr_service_commit=$ocr_service_commit" >> $GITHUB_ENV
           etreasury_commit=$(git log -1 --pretty=format:%H -- backend/treasury-backend)
           echo "etreasury_commit=$etreasury_commit" >> $GITHUB_ENV
           epayment_commit=$(git log -1 --pretty=format:%H -- backend/treasury-webpage)
@@ -231,6 +233,8 @@ jobs:
            --set advocate.initContainers.dbMigration.image.tag=v1.0.0-${{ env.advocate_commit }} \
            --set case.image.tag=v1.0.0-${{ env.case_commit }} \
            --set case.initContainers.dbMigration.image.tag=v1.0.0-${{ env.case_commit }} \
+           --set ocr-service.image.tag=v1.0.0-${{ env.ocr_service_commit }} \
+           --set ocr-service.initContainers.dbMigration.image.tag=v1.0.0-${{ env.ocr_service_commit }} \
            --set casemanagement.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
            --set casemanagement.initContainers.dbMigration.image.tag=v1.0.0-${{ env.casemanagement_commit }} \
            --set evidence.image.tag=v1.0.0-${{ env.evidence_commit }} \

diff --git a/deploy-as-code/charts/core-services/coreservices-helmfile.yaml b/deploy-as-code/charts/core-services/coreservices-helmfile.yaml
@@ -235,11 +235,11 @@ releases:
         team: "solutions"
       <<: *default
 
-#    - name: e-sign-svc  # Replace with your desired namespace
-#      installed: true
-#      labels:
-#        team: "solutions"
-#      <<: *default
+    - name: e-sign-svc  # Replace with your desired namespace
+      installed: true
+      labels:
+        team: "solutions"
+      <<: *default
 
     - name: esign-interceptor  # Replace with your desired namespace
       installed: true

diff --git a/deploy-as-code/charts/core-services/ocr-service/values.yaml b/deploy-as-code/charts/core-services/ocr-service/values.yaml
@@ -17,12 +17,12 @@ initContainers:
     schemaTable: "ocr-service_schema"
     image:
       repository: "pucarsolutionsdev.azurecr.io/pucar_ocr_svc_db"
-      tag: v1.0.0-8d21efdbbb95a1bce3a0555c452a5568cbccf301
+      tag: v1.0.0-43fda1f5471717f3898bc96188ea068a4617ddd7
 
 # Container Configs
 image:
   repository: "pucarsolutionsdev.azurecr.io/pucar_ocr_svc"
-  tag: v1.0.0-8d21efdbbb95a1bce3a0555c452a5568cbccf301
+  tag: v1.0.0-43fda1f5471717f3898bc96188ea068a4617ddd7
   imagePullPolicy: Always
 replicas: "1"
 httpPort: 8080