Revert "ELI-452: Moves non workflows to helpers"

This reverts commit abb71d2.

Author: shweta-nhs

.github/workflows/helpers/base-deploy.yml .github/workflows/base-deploy.yml.github/workflows/helpers/base-deploy.yml renamed to .github/workflows/base-deploy.yml

@@ -168,7 +168,7 @@ jobs:
     name: "Regression Tests"
     if: ${{ needs.metadata.outputs.environment == 'preprod' }}
     needs: deploy
-    uses: ./.github/workflows/helpers/regression-tests.yml
+    uses: ./.github/workflows/regression-tests.yml
     with:
       ENVIRONMENT: "preprod"
       VERSION_NUMBER: "main"

.github/workflows/cicd-1-pull-request.yaml

@@ -38,6 +38,7 @@ jobs:
           echo "python_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
           echo "terraform_version=$(grep "^terraform" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
           echo "version=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+#          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
       - name: "Check if pull request exists for this branch"
         id: pr_exists
         env:
@@ -64,11 +65,11 @@ jobs:
           export VERSION="${{ steps.variables.outputs.version }}"
           export DOES_PULL_REQUEST_EXIST="${{ steps.pr_exists.outputs.does_pull_request_exist }}"
           make list-variables
-  commit-stage:
+  commit-stage: # Recommended maximum execution time is 2 minutes
     name: "Commit stage"
     if: github.event.pull_request.draft == false
     needs: [metadata]
-    uses: ./.github/workflows/helpers/stage-1-commit.yaml
+    uses: ./.github/workflows/stage-1-commit.yaml
     with:
       build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
       build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"
@@ -78,11 +79,11 @@ jobs:
       terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
       version: "${{ needs.metadata.outputs.version }}"
     secrets: inherit
-  test-stage:
+  test-stage: # Recommended maximum execution time is 5 minutes
     name: "Test stage"
     if: github.event.pull_request.draft == false
     needs: [metadata, commit-stage]
-    uses: ./.github/workflows/helpers/stage-2-test.yaml
+    uses: ./.github/workflows/stage-2-test.yaml
     with:
       build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
       build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"
@@ -92,10 +93,10 @@ jobs:
       terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
       version: "${{ needs.metadata.outputs.version }}"
     secrets: inherit
-  build-stage:
+  build-stage: # Recommended maximum execution time is 3 minutes
     name: "Build stage"
     needs: [metadata, test-stage]
-    uses: ./.github/workflows/helpers/stage-3-build.yaml
+    uses: ./.github/workflows/stage-3-build.yaml
     if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
     with:
       build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
@@ -106,10 +107,10 @@ jobs:
       terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
       version: "${{ needs.metadata.outputs.version }}"
     secrets: inherit
-  acceptance-stage:
+  acceptance-stage: # Recommended maximum execution time is 10 minutes
     name: "Acceptance stage"
     needs: [metadata, build-stage]
-    uses: ./.github/workflows/helpers/stage-4-acceptance.yaml
+    uses: ./.github/workflows/stage-4-acceptance.yaml
     if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
     with:
       build_datetime: "${{ needs.metadata.outputs.build_datetime }}"

.github/workflows/cicd-2-publish.yaml

@@ -133,7 +133,7 @@ jobs:
   regression-tests:
     name: "Regression Tests"
     needs: publish
-    uses: ./.github/workflows/helpers/regression-tests.yml
+    uses: ./.github/workflows/regression-tests.yml
     with:
       ENVIRONMENT: "dev"
       VERSION_NUMBER: "main"

.github/workflows/cicd-3-test-deploy.yaml

@@ -108,7 +108,7 @@ jobs:
   regression-tests:
     name: "Regression Tests"
     needs: deploy
-    uses: ./.github/workflows/helpers/regression-tests.yml
+    uses: ./.github/workflows/regression-tests.yml
     with:
       ENVIRONMENT: "test"
       VERSION_NUMBER: "main"

.github/workflows/cicd-4-preprod-deploy.yml

@@ -24,7 +24,7 @@ on:
 
 jobs:
   call:
-    uses: ./.github/workflows/helpers/base-deploy.yml
+    uses: ./.github/workflows/base-deploy.yml
     with:
       environment: preprod
       ref: ${{ inputs.ref }}

.github/workflows/cicd-5-prod-deploy.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   call:
-    uses: ./.github/workflows/helpers/base-deploy.yml
+    uses: ./.github/workflows/base-deploy.yml
     with:
       environment: prod
       ref: ${{ inputs.ref }}