Skip to content

Commit

Permalink
EL-1825 Removing FALA tests and docker set up (#146)
Browse files Browse the repository at this point in the history
* EL-1825 Removing FALA tests and docker set up

* EL-1825 Removing circleci pull for FALA and updated wrapper.sh to not use FALA tags

* EL-1825 Removing circleci pull for FALA and updated wrapper.sh to not use FALA tags

* EL-1825 Removing FALA constants and orbs
  • Loading branch information
psweeting1 authored Nov 14, 2024
1 parent 6be7606 commit 79b2772
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 367 deletions.
7 changes: 0 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ jobs:
- run: |
./.circleci/pull_images clasocketserver
# Pull fala image
- aws-cli/setup:
role_arn: $FALA_ECR_ROLE_TO_ASSUME
region: $ECR_REGION
- run: |
./.circleci/pull_images fala
- run:
name: Build / Check services are up
command: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# cla-end-to-end-tests
This is the behave end to end test suite which covers the CLA applications for the laa-cla-fala team.
This is the behave end-to-end test suite which covers the CLA applications for the laa-cla-fala team.
This repository defines a Circlei CI orb and a docker image alongside the `behave` test suite itself,
allowing portability to the CI pipelines of the other applications.

Expand All @@ -15,7 +15,7 @@ of the `ministryofjustice` organisation, which you should be from github.
```
circleci orb publish orb.yml ministryofjustice/cla-end-to-end-tests@dev:first
```
To incorporate orb publishing into the CI pipeline in future, we may want to use the `circleci/orb-tools` orb
To incorporate orb publishing into the CI pipeline in the future, we may want to use the `circleci/orb-tools` orb

### Job and command
The orb exposes a `behave` job and a `behave` command. The command should not need to be used directly:
Expand Down
4 changes: 0 additions & 4 deletions behave/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ Cla_public feature files:

`behave > features > cla_public`

fala feature files:

`behave > features > fala`

## How to run tests

If you are working on an M1 machine, please add the below to your behave/.env file. There is an example file at .env.m1.example that you can rename to .env to avoid doing this.
Expand Down
2 changes: 0 additions & 2 deletions behave/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ services:
ALPINE_BASE_IMAGE: ${ALPINE_BASE_IMAGE:-alpine:3.15}
clasocketserver:
build: https://github.com/ministryofjustice/cla_frontend.git#master:cla_socketserver
fala:
build: https://github.com/ministryofjustice/fala.git#master
35 changes: 0 additions & 35 deletions behave/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
-wait tcp://clasocketserver:8005
-wait tcp://clabackend:8000
-wait tcp://clapublic:8000
-wait tcp://fala:8000
-wait tcp://seleniumchrome:4444
-wait tcp://clabackendooh:8000
-wait tcp://clabackendsecurity:8000
Expand All @@ -22,7 +21,6 @@ services:
- clabackend
- seleniumchrome
- clasocketserver
- fala
- prev_db
- clabackendooh
- clabackendsecurity
Expand All @@ -43,15 +41,13 @@ services:
CLA_E2E_PUBLIC_URL: ${CLA_E2E_PUBLIC_URL:-http://clapublic:8000}
CLA_E2E_BACKEND_URL: ${CLA_E2E_BACKEND_URL:-http://clabackend:8000}
CLA_E2E_FRONTEND_URL: ${CLA_E2E_FRONTEND_URL:-http://clafrontend:8000}
CLA_E2E_FALA_URL: ${CLA_E2E_FALA_URL:-http://fala:8000}
CLA_E2E_SELENIUM_WEB_DRIVER_URL: ${CLA_E2E_SELENIUM_WEB_DRIVER_URL:-http://seleniumchrome:4444/wd/hub}
CALL_CENTRE_CLIENT_ID: b4b9220ffcb11ebfdab1
CALL_CENTRE_SECRET_ID: 2df71313bdd38a2e1b815015e1b14387e7681d41
CALL_CENTRE_TEST_USER: test_operator
CLA_PROVIDER_CLIENT_ID: 59657ed22d980251cdd3
CLA_PROVIDER_SECRET_ID: 0494287c65bdf61d29f0eeed467ec8e090f0d80f
DATABASE_SNAPSHOT_ENABLED: ${DATABASE_SNAPSHOT_ENABLED:-false}
FALA_TESTS_ONLY: ${FALA_TESTS_ONLY:-false}
PGPASSWORD: postgres
PGUSER: postgres
PGHOST: db
Expand Down Expand Up @@ -236,34 +232,3 @@ services:
TESTING: "True"
depends_on:
- clabackend

fala:
image: ${FALA_IMAGE:-754256621582.dkr.ecr.eu-west-2.amazonaws.com/laa-get-access/fala:master}
ports:
- "8013:8000"
environment:
HOST_NAME: "fala"
SECRET_KEY: CHANGE_ME
LAALAA_API_HOST: https://laa-legal-adviser-api-staging.apps.live-1.cloud-platform.service.justice.gov.uk
CLA_ENV: dev
DB_PORT: 5440
DB_HOST: fala_db
DB_NAME: fala_db
DB_USER: postgres
DB_PASSWORD: postgres
depends_on:
- fala_db

fala_db:
image: postgres:16.3
ports:
- "5440:5432"
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: fala_db
healthcheck:
test: ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}'"]
interval: 10s
timeout: 3s
retries: 3
86 changes: 0 additions & 86 deletions behave/features/cla_fala/fala_end_to_end_tests.feature

This file was deleted.

Loading

0 comments on commit 79b2772

Please sign in to comment.