From 54b3f14f5ead9e48cb0febc70229b5a9cea5ba6e Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Mon, 23 Oct 2023 13:36:36 +0300 Subject: [PATCH 1/2] OHRI-1909: Form submission should use the form_uuid and encounter_uuid fetched from the backend - removing uuid and encounterType in form_json for validation that the form engine loads the uuid and encounter type from form object fetched from the backend --- distro/configuration/ampathforms/covid_lab_order_v1.0.json | 3 +-- distro/configuration/ampathforms/pmtct_antenatal_v1.0.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/distro/configuration/ampathforms/covid_lab_order_v1.0.json b/distro/configuration/ampathforms/covid_lab_order_v1.0.json index a34187ada..d84bbb5e5 100644 --- a/distro/configuration/ampathforms/covid_lab_order_v1.0.json +++ b/distro/configuration/ampathforms/covid_lab_order_v1.0.json @@ -469,8 +469,7 @@ } ], "processor": "EncounterFormProcessor", - "uuid": "9fd9169c-7a10-3145-b7e2-530a6f1f250d", - "encounterType": "a77d3e7f-5c8f-4074-a207-77a70e197b0c", + "uuid": "xxxx", "encounter": "COVID Lab Encounter", "referencedForms": [], "allowUnspecifiedAll": true diff --git a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json index e541e568f..ae0da6078 100644 --- a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json +++ b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json @@ -1115,9 +1115,8 @@ } ], "processor":"EncounterFormProcessor", - "uuid":"12de5bc5-352e-4faf-9961-a2125085a75c", + "uuid":"xxxx", "referencedForms":[], - "encounterType":"677d1a80-dbbe-4399-be34-aa7f54f11405", "postSubmissionActions": ["PTrackerSubmissionAction", "ArtSubmissionAction"], "allowUnspecifiedAll":true, "formOptions": { From 9799166c9742d10f2d6d4ed4ae4462b5308191c5 Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Mon, 23 Oct 2023 13:39:05 +0300 Subject: [PATCH 2/2] Updated CI/CD workflow - removed actions that are not *required* --- .github/workflows/ohri-dev.yml | 44 ++++------------------------------ 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ohri-dev.yml b/.github/workflows/ohri-dev.yml index 5643f91de..6a0d3926c 100644 --- a/.github/workflows/ohri-dev.yml +++ b/.github/workflows/ohri-dev.yml @@ -115,53 +115,17 @@ jobs: cache-to: type=gha,mode=max - name: Save image digest run: echo "::set-output name=image::${{ steps.build-and-push.output.digest }}" - - dev_server_status: - if: github.ref == 'refs/heads/dev' - runs-on: ubuntu-latest - needs: docker_staging_backend - - steps: - - name: Wait for 5 minutos - Let Images reflect on Docker Hub - run: sleep 300 - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Copy files to /home/runner/ - run: | - ls -la -t - cp -r $GITHUB_WORKSPACE/.github/.ssh/ /home/runner/ - - - name: List contents of /home/runner/ - run: ls -la /home/runner/ - - - name: webfactory/ssh-agent - uses: webfactory/ssh-agent@v0.8.0 - with: - ssh-private-key: ${{ secrets.OHRI_SSH_PRIVATE_KEY }} - - - name: Check SSH to remote OHRI Dev status - run: | - ssh-keygen -R 172.19.0.16 - - dev_server_connection_dev: - runs-on: ubuntu-latest - needs: dev_server_status - steps: - - name: SSH to remote OHRI Dev server - run: | - ssh -o StrictHostKeyChecking=no -T ohri@172.19.0.16 -p 2216 -J ohri@20.172.182.46 -p 2202 - ls -la -t && \ - cd /opt && \ - ls -la -t dev_deploy: runs-on: ubuntu-latest - needs: dev_server_status + needs: docker_staging_backend if: (github.event_name == 'push' || github.event.pull_request.merged) steps: + - name: Wait for 3 minutes - Let Images reflect on Docker Hub + run: sleep 180 + - name: Checkout code uses: actions/checkout@v2