retrying - Next merge for PROD release 5th Sept 2023

.github/workflows/cd-forms-flow-web-root-config.yaml

@@ -12,6 +12,7 @@ on:
       - dev
       - main
       - epdds-270 # Remove in future, just to verify this works
+      - epdds-270-fix # Remove in future, just to verify this works
     paths:
       - "forms-flow-ai/forms-flow-ai-ee/forms-flow-web-root-config"
       - ".github/workflows/cd-forms-flow-web-root-config.yaml"
@@ -64,20 +65,7 @@ jobs:
         run: |
           oc project ${{ secrets.OC_NAMESPACE_NAMEPLATE }}-tools
 
-      # Build from either dev or main branch as appropriate
-      - name: Build from ${{ env.BRANCH_NAME }} branch
-        shell: bash
-        run: |
-          oc patch bc/${{ env.APP_NAME }}-dev-build -p '{"spec":{"source":{"git":{"ref":"${{ env.BRANCH_NAME }}"}}}}'
-
       - name: Start Build Openshift
         shell: bash
         run: |
-          oc start-build ${{ env.APP_NAME }}-dev-build --wait
-
-
-      - name: Tag+Deploy for ${{ env.TAG_NAME }}
-        shell: bash
-        run: |
-          oc tag ${{ env.APP_NAME }}:latest ${{ env.APP_NAME }}:${{ env.TAG_NAME }}
-
+          oc start-build ${{ env.APP_NAME }}-${{ env.TAG_NAME }}-build --wait

.github/workflows/cd-openshift-prod.yaml

@@ -111,3 +111,45 @@ jobs:
     #     with:
     #       tag: "release/${{ inputs.RELEASE_VERSION }}"
     #       message: "Release version ${{ inputs.RELEASE_VERSION }}"
+
+
+  forms-flow-root-config-and-microfrontends:
+    runs-on: ubuntu-20.04
+
+    if: github.repository == 'bcgov/nr-epd-digital-services'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set ENV variables
+        id: set-variable
+        # make sure to update the TOOLS_NAME once all the environment for forms-flow-ai-web is ready
+        run: |
+          echo "For ${{ github.ref_name }} branch for PROD"
+          echo "TOOLS_NAME=${{secrets.OC_NAMESPACE_NAMEPLATE}}" >> $GITHUB_ENV
+          echo "TAG_NAME="prod"" >> $GITHUB_ENV
+          echo "BRANCH_NAME="main"" >> $GITHUB_ENV
+          echo "ENV_NAME="prod"" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Login Openshift
+        shell: bash
+        run: |
+          oc login --server=${{secrets.OC_SERVER}} --token=${{secrets.OC_TOKEN}}
+
+      - name: Tools project
+        shell: bash
+        run: |
+          oc project ${{ secrets.OC_NAMESPACE_NAMEPLATE }}-tools
+
+      - name: Tag Microfrontends from Test
+        shell: bash
+        run: |
+          oc tag forms-flow-nav:test forms-flow-nav:prod
+          oc tag forms-flow-theme:test forms-flow-theme:prod
+          oc tag forms-flow-web-ee:test forms-flow-web-ee:prod
+
+
+      - name: Start Build Openshift
+        shell: bash
+        run: |
+          oc start-build ${{ env.APP_NAME }}-prod-build --wait
+

.gitignore

@@ -122,4 +122,7 @@ backend/etl/debezium-jdbc/.classpath
 backend/etl/debezium-jdbc/target/
 
 
-notes/
+notes/
+
+forms-flow-ai/forms-flow-bpm/postgres/
+forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/postgres/

forms-flow-ai/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn

@@ -915,6 +915,7 @@ execution.setVariable('requestType', 'CSSA');</camunda:script>
       <bpmn:outgoing>Flow_19ktqsm</bpmn:outgoing>
       <bpmn:outgoing>Flow_0qbjx6e</bpmn:outgoing>
       <bpmn:outgoing>Flow_1tu4hj7</bpmn:outgoing>
+      <bpmn:outgoing>Flow_1ev1kr6</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:userTask id="Activity_08ykdar" name="Validate Bundle" camunda:candidateGroups="formsflow/formsflow-reviewer/cssa-team">
       <bpmn:extensionElements>
@@ -1170,6 +1171,7 @@ system.out.println ("isSentFromSociety "+ task.execution.getVariable('isSentFrom
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0kfjdmp</bpmn:incoming>
       <bpmn:incoming>Flow_0543g25</bpmn:incoming>
+      <bpmn:incoming>Flow_1ev1kr6</bpmn:incoming>
       <bpmn:outgoing>Flow_0d8ruax</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:userTask id="Activity_1uc1xs1" name="Validate Bundle" camunda:candidateGroups="formsflow/formsflow-reviewer/csap">
@@ -1234,6 +1236,9 @@ system.out.println ("form signed");</camunda:script>
     <bpmn:sequenceFlow id="Flow_0aabyhy" sourceRef="Gateway_1lbpcug" targetRef="Activity_08ykdar">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Recheck' and isSentFromSociety == true}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_1ev1kr6" name="Recheck" sourceRef="Gateway_0oobb3z" targetRef="Activity_1ao3zkj">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Recheck'}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
   </bpmn:process>
   <bpmn:message id="Message_1ngb2eg" name="application_resubmitted" />
   <bpmn:message id="Message_0lm44we" name="application_resubmitted" />
@@ -2151,6 +2156,15 @@ system.out.println ("form signed");</camunda:script>
         <di:waypoint x="3020" y="1480" />
         <di:waypoint x="1305" y="1480" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1ev1kr6_di" bpmnElement="Flow_1ev1kr6">
+        <di:waypoint x="1230" y="1620" />
+        <di:waypoint x="1100" y="1620" />
+        <di:waypoint x="1100" y="1020" />
+        <di:waypoint x="1205" y="1020" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1048" y="1543" width="44" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>