bug/3141-e2e-failing + nexus integration

.circleci/deployment/workflows.yml

@@ -6,6 +6,7 @@
             - equal: [ master, << pipeline.git.branch >> ]
             - equal: [ main, << pipeline.git.branch >> ]
             - equal: [ develop, << pipeline.git.branch >> ]
+            - equal: [ bug/3141-e2e-failing, << pipeline.git.branch >> ]
             - << pipeline.parameters.run_dev_deployment >>
         - not: << pipeline.parameters.run_nightly_owasp_scan >>
 
@@ -21,13 +22,15 @@
             branches:
               ignore:
                 - develop
+                - bug/3141-e2e-failing
                 - main
                 - master
       - deploy-infrastructure-staging:
           filters:
             branches:
               only:
                 - develop
+                - bug/3141-e2e-failing
                 - main
       - deploy-infrastructure-production:
           filters:
@@ -41,6 +44,7 @@
             branches:
               ignore:
                 - develop
+                - bug/3141-e2e-failing
                 - main
                 - master
       - enable-versioning:
@@ -93,13 +97,15 @@
                 - develop
                 - main
                 - master
+                - bug/3141-e2e-failing
       - deploy-develop:
           requires:
             - deploy-infrastructure-staging
           filters:
             branches:
               only:
                 - develop
+                - bug/3141-e2e-failing 
       - deploy-staging:
           requires:
             - deploy-infrastructure-staging
@@ -121,9 +127,11 @@
             branches:
               only:
                 - develop
+                - bug/3141-e2e-failing
       - make_erd: # from ../util folder
           filters:
             branches:
               only:
                 - develop
                 - master
+

Taskfile.yml

@@ -212,6 +212,14 @@ tasks:
       - docker-compose -f docker-compose.local.yml up tdp-frontend-test -d
       - docker-compose -f docker-compose.local.yml exec tdp-frontend-test sh -c "npm run test:cov"
 
+  cypress:
+    desc: Run cypress tests
+    dir: tdrs-frontend
+    cmds:
+      - docker-compose -f docker-compose.local.yml up tdp-frontend-test -d
+      - npm run test:e2e
+
+
   frontend-lint:
     desc: Run eslint in the frontend container
     dir: tdrs-frontend
@@ -246,4 +254,4 @@ tasks:
   help:
     desc: Show this help message
     cmds:
-      - task --list
+      - task --list

tdrs-backend/Dockerfile

@@ -9,18 +9,24 @@ ENV DJANGO_SETTINGS_MODULE=tdpservice.settings.local
 ENV DJANGO_CONFIGURATION=Local
 # Allows docker to cache installed dependencies between builds
 COPY Pipfile Pipfile.lock /tdpapp/
+COPY sources.list /etc/apt/sources.list
+#RUN  bash -c 'echo "deb https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy/ buster main"' >> /etc/apt/sources.list
 WORKDIR /tdpapp/
 # Download latest listing of available packages:
 RUN apt-get -y update
 # Upgrade already installed packages:
 RUN apt-get -y upgrade
+# Install packages:
+RUN apt-get install -y gcc graphviz graphviz-dev libpq-dev python3-dev vim curl ca-certificates
+
 # Postgres client setup
-RUN apt --purge remove postgresql postgresql-* && apt install -y postgresql-common curl ca-certificates && install -d /usr/share/postgresql-common/pgdg && \
+RUN bash -c 'echo "deb [trusted=yes] https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-postgres/ buster-pdpg main" >> /etc/apt/sources.list'
+RUN apt-get update -y && apt-get upgrade -y
+RUN apt install -y postgresql-common && install -d /usr/share/postgresql-common/pgdg && \
+sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc trusted=yes] https://tdp-nexus.dev.raftlabs.tech/repository/apt-proxy-postgres/ buster-pgdg main" >> /etc/apt/sources.list' && \
 curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
-sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
-apt -y update && apt install postgresql-client-15 -y
-# Install packages:
-RUN apt install -y gcc graphviz graphviz-dev libpq-dev python3-dev vim
+apt -y update && apt -y upgrade && apt install postgresql-client-15 -y
+
 # Install pipenv
 RUN pip install --upgrade pip pipenv
 RUN pipenv install --dev --system --deploy

tdrs-backend/Pipfile

@@ -1,6 +1,7 @@
 [[source]]
 name = "pypi"
-url = "https://pypi.org/simple"
+trusted-host = "https://tdp-nexus.dev.raftlabs.tech/"
+url = "https://tdp-nexus.dev.raftlabs.tech/repository/pypi-proxy/simple"
 verify_ssl = true
 
 [dev-packages]
@@ -61,4 +62,4 @@ sendgrid = "==6.10.0"
 sentry-sdk = "==2.11.0"
 
 [requires]
-python_version = "3.10.8"
+python_version = "3.10.8"