NIAD 3125 branchedoff (#165)

* Delete Jenkins stage for end to end tests as they rely on OpenTest * Fixing spelling and syntax * Upgrade Terraform from 0.12.3 to 0.12.31 to resolve issue in Deploy MHS (SpineRouteLookup) pipeline stage * Add fix for stickiness bug and desired_count on terraform
NHSDigital · Aug 7, 2024 · 276f779 · 276f779
1 parent c7fd7ab
commit 276f779
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 479 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -247,6 +247,15 @@ pipeline {
                         lock('exemplar-test-environment')
                     }
                     stages {
+                        stage('Updating Terraform Binary') {
+                            steps {
+                                sh label: 'Updating Terraform Binary', script: """
+                                            wget -O terraform.zip https://releases.hashicorp.com/terraform/0.12.31/terraform_0.12.31_linux_amd64.zip && \
+                                            unzip -o terraform.zip -d /usr/bin/ && \
+                                            rm terraform.zip
+                                """
+                            }
+                        }
                         stage('Deploy MHS (SpineRouteLookup)') {
                             steps {
                                 dir('pipeline/terraform/mhs-environment') {
@@ -341,31 +350,6 @@ pipeline {
                                 }
                             }
                         }
-
-//                         stage('Integration Tests (SpineRouteLookup)') {
-//                             steps {
-//                                 dir('integration-tests/integration_tests') {
-//                                     sh label: 'Installing integration test dependencies', script: 'pipenv install --dev --deploy --ignore-pipfile'
-//                                     // Wait for MHS load balancers to have healthy targets
-//                                     dir('../../pipeline/scripts/check-target-group-health') {
-//                                         sh script: 'pipenv install'
-//
-//                                         timeout(13) {
-//                                             waitUntil {
-//                                                 script {
-//                                                     def r = sh script: 'sleep 10; AWS_DEFAULT_REGION=eu-west-2 pipenv run main ${MHS_OUTBOUND_TARGET_GROUP} ${MHS_INBOUND_TARGET_GROUP}  ${MHS_ROUTE_TARGET_GROUP}', returnStatus: true
-//                                                     return (r == 0);
-//                                                 }
-//                                             }
-//                                         }
-//                                     }
-//                                     sh label: 'Running integration tests', script: """
-//                                         export SKIP_FORWARD_RELIABLE_INT_TEST=true
-//                                         pipenv run inttests
-//                                     """
-//                                 }
-//                             }
-//                         }
                     }
                 }
                 stage('Run Integration Tests (SDS API)') {
@@ -467,32 +451,6 @@ pipeline {
                                 }
                             }
                         }
-
-                        stage('Integration Tests (SDS API)') {
-                            steps {
-                                dir('integration-tests/integration_tests') {
-                                    sh label: 'Installing integration test dependencies', script: 'pipenv install --dev --deploy --ignore-pipfile'
-
-                                    // Wait for MHS load balancers to have healthy targets
-                                    dir('../../pipeline/scripts/check-target-group-health') {
-                                        sh script: 'pipenv install'
-
-                                        timeout(13) {
-                                            waitUntil {
-                                                script {
-                                                    def r = sh script: 'sleep 10; AWS_DEFAULT_REGION=eu-west-2 pipenv run main ${MHS_OUTBOUND_TARGET_GROUP} ${MHS_INBOUND_TARGET_GROUP}  ${MHS_ROUTE_TARGET_GROUP}', returnStatus: true
-                                                    return (r == 0);
-                                                }
-                                            }
-                                        }
-                                    }
-                                    sh label: 'Running integration tests', script: """
-                                        export SKIP_FORWARD_RELIABLE_INT_TEST=true
-                                        pipenv run inttests
-                                    """
-                                }
-                            }
-                        }
                     }
                 }
             } // parallel

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The following illustration shows the MHS adaptor in the wider systems context:
 ## Repository Contents
 This repository contains the following directories:
 - [common](common) - A Python package containing components and utilities that are common to several integration adaptors.
-- [dockers](dockers) - files used to create each of the base docker images that make up the MHS adaptor
+- [dockers](dockers) - Files used to create each of the base docker images that make up the MHS adaptor
 - [documentation](documentation) - Documentation and assets for the integration adaptors including workflows and two architecture exemplars based on AWS and Azure
 - [integration-tests](integration-tests) - A package containing integration tests intended to pre-assure the MHS Adaptor
 - [mhs](mhs) - A pre-assured implementation of a Message Handling Service (MHS), that encapsulates the details of Spine
@@ -33,7 +33,7 @@ Each directory contains its own README.md file which provides more details.
 
 
 ## Running MHS Adaptor locally
-It may be useful to run this adaptors in a local environment. Please refer to [running the MHS adaptor locally](mhs/running-mhs-adaptor-locally.md) 
+It may be useful to run this adaptor in a local environment. Please refer to [running the MHS adaptor locally](mhs/running-mhs-adaptor-locally.md) 
 a step-by-step guide on how to set this up.
 
 ## Resources

diff --git a/integration-tests/integration_tests/integration_tests/end_to_end_tests/__init__.py b/integration-tests/integration_tests/integration_tests/end_to_end_tests/__init__.py
diff --git a/integration-tests/integration_tests/integration_tests/end_to_end_tests/common_assertions.py b/integration-tests/integration_tests/integration_tests/end_to_end_tests/common_assertions.py
diff --git a/...ts/integration_tests/end_to_end_tests/int_asynchronous_express_messaging_pattern_tests.py b/...ts/integration_tests/end_to_end_tests/int_asynchronous_express_messaging_pattern_tests.py
diff --git a/...s/integration_tests/end_to_end_tests/int_asynchronous_reliable_messaging_pattern_tests.py b/...s/integration_tests/end_to_end_tests/int_asynchronous_reliable_messaging_pattern_tests.py