newskit 0.0.0-df69f6470 → 0.0.0-e02a96ba5

package/.circleci/config.yml

@@ -1,206 +1,241 @@
 version: 2.1
 
 orbs:
-  slack: circleci/slack@3.4.1
+  slack: circleci/slack@4.13.3
+  aws-cli: circleci/aws-cli@3.1
+  github-cli: circleci/github-cli@2.7.2
+  node: circleci/node@5.1.0
 
-slack_status: &slack_status
-  channel: '#nuk-pp-newskit'
-  mentions: 'newskitdevs'
-  fail_only: true
-  only_for_branches: 'develop,master'
+slack_notify: &slack_notify
+  event: 'fail'
+  channel: '#newskit-all-team'
+  mentions: '@newskitdevs'
+  branch_pattern: 'main'
+  # The following tag_pattern allows slack messages to be sent also when workflows are triggered by tags.
+  # Such as in the release process. The tags MUST mirror the one used by release workflows filters.
+  tag_pattern: 'trigger-release@([0-9])(\.([0-9])){2}, v([0-9])(\.([0-9])){2}'
+  custom: |
+    {
+      "blocks": [
+        {
+          "type": "section",
+          "text": {
+            "type": "mrkdwn",
+            "text": ":red_circle: A *${CIRCLE_JOB}* job has failed!"
+          }
+        },
+        {
+          "type": "section",
+          "fields": [
+            {
+              "type": "mrkdwn",
+              "text": "*Project*: $CIRCLE_PROJECT_REPONAME"
+            },
+            {
+              "type": "mrkdwn",
+              "text": "*Branch*: $CIRCLE_BRANCH"
+            },
+            {
+              "type": "mrkdwn",
+              "text": "*Author*: $CIRCLE_USERNAME"
+            },
+            {
+              "type": "mrkdwn",
+              "text": "*Tag*: $CIRCLE_TAG"
+            }
+          ]
+        },
+        {
+          "type": "section",
+          "fields": [
+            {
+              "type": "mrkdwn",
+              "text": "*Mentions*: $SLACK_PARAM_MENTIONS"
+            }
+          ]
+        },
+        {
+          "type": "actions",
+          "elements": [
+            {
+              "type": "button",
+              "text": {
+                "type": "plain_text",
+                "text": "View Job"
+              },
+              "url": "${CIRCLE_BUILD_URL}"
+            }
+          ]
+        }
+      ]
+    }
 
-# ========== APPLITOOLS ENVIRONMENT VARIABLES START ==========
-
-applitools_defaults: &applitools_defaults
-  command: |
-    export APPLITOOLS_BATCH_ID=`echo $CIRCLE_SHA1`
-    export APPLITOOLS_API_KEY=${APPLITOOLS_API_KEY}
-    export APPLITOOLS_DONT_CLOSE_BATCHES=true
-    echo "export APPLITOOLS_BATCH_ID=${APPLITOOLS_BATCH_ID}" >> $BASH_ENV
-    echo "export APPLITOOLS_API_KEY=${APPLITOOLS_API_KEY}" >> $BASH_ENV
-
-# ========== APPLITOOLS ENVIRONMENT VARIABLES END ==========
+cypress_defaults: &cypress_defaults
+  environment:
+    CYPRESS_CACHE_FOLDER: '~/project/.cache/Cypress'
 
 executors:
   # A basic image with just raw Alpine on it that you can run commands on
   base:
     docker:
-      - image: $PIPELINE_REGISTRY/base:latest
-        auth:
-          username: $DOCKER_USERNAME
-          password: $DOCKER_PASSWORD
-
-  flux-deploy:
-    docker:
-      - image: $PIPELINE_REGISTRY/flux-k8s:latest
-        auth:
-          username: $DOCKER_USERNAME
-          password: $DOCKER_PASSWORD
-
-  kubectl-deploy:
-    docker:
-      - image: $PIPELINE_REGISTRY/kubectl:0.1.51
-        auth:
-          username: $DOCKER_USERNAME
-          password: $DOCKER_PASSWORD
-
-  terraform:
-    docker:
-      - image: hashicorp/terraform:0.12.28
+      - image: cimg/base:latest
 
-  python:
+  # Having both AWS and Terraform on the same image makes it easier to run commands via OIDC
+  aws-cli-and-terraform:
     docker:
-      - image: circleci/python:3.7
+      - image: newsuk/terraform:1.2.1
+    resource_class: large
 
   node:
     docker:
-      - image: circleci/node:12
-  
+      - image: cimg/node:20.7.0-browsers
+
   node-large:
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:20.7.0-browsers
     resource_class: large
+    environment:
+      NODE_OPTIONS: --max_old_space_size=7680
+
+  node-xlarge:
+    docker:
+      - image: cimg/node:20.7.0-browsers
+    resource_class: xlarge
+    environment:
+      NODE_OPTIONS: --max_old_space_size=15872
 
   cypress:
     docker:
-      - image: cypress/browsers:node12.16.2-chrome81-ff75
+      - image: cypress/browsers:node-20.16.0-chrome-127.0.6533.88-1-ff-128.0.3-edge-127.0.2651.74-1
+    resource_class: medium
 
   java:
     docker:
-     - image: circleci/openjdk:8u252-jdk-buster
+      - image: cimg/openjdk:8u252-jdk-buster
 
 commands:
-  terraform_init:
+  terraform_init_oidc:
     description: Run Terraform Init
     parameters:
+      aws_region:
+        description: AWS Region
+        type: string
+        default: '${AWS_DEFAULT_REGION}'
+      aws_assume_role_arn:
+        description: AWS ARN For Assume Role
+        type: string
+        default: '${S3_AWS_ASSUME_ROLE_ARN}'
       package:
         type: string
+      session_context:
+        type: string
+        default: s3
       terraform_arg:
         description: provide terraform arguments
         type: string
-        default: ""
+        default: ''
     steps:
       - run:
-          name: Terraform init
+          name: Terraform init OIDC
           command: |
-            source $BASH_ENV
+            export AWS_DEFAULT_REGION=<< parameters.aws_region >>
+            # use the OpenID Connect token to obtain AWS credentials
+            (aws sts assume-role-with-web-identity \
+              --role-arn << parameters.aws_assume_role_arn >> \
+              --role-session-name "${CIRCLE_WORKFLOW_ID}-<< parameters.session_context >>-tf" \
+              --web-identity-token $CIRCLE_OIDC_TOKEN \
+              --duration-seconds 3600 \
+              --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' \
+              --output text) > assume-tf.txt
+            read -r AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN < assume-tf.txt
+            export AWS_DEFAULT_REGION AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
             cd terraform/<< parameters.package >>
+            export TF_LOG="TRACE"
+            export TF_LOG_PATH="./terraform-debug.log"
             terraform init << parameters.terraform_arg >>
 
-  terraform_plan:
+  terraform_plan_oidc:
     description: Run Terraform Plan
     parameters:
+      aws_region:
+        description: AWS Region
+        type: string
+        default: '${AWS_DEFAULT_REGION}'
+      aws_assume_role_arn:
+        description: AWS ARN For Assume Role
+        type: string
+        default: '${S3_AWS_ASSUME_ROLE_ARN}'
       package:
         type: string
+      session_context:
+        type: string
+        default: s3
       terraform_arg:
         description: provide terraform arguments
         type: string
-        default: ""
+        default: ''
     steps:
       - run:
-          name: Terraform plan
+          name: Terraform plan OIDC
           command: |
-            source $BASH_ENV
+            export AWS_DEFAULT_REGION=<< parameters.aws_region >>
+            # use the OpenID Connect token to obtain AWS credentials
+            (aws sts assume-role-with-web-identity \
+              --role-arn << parameters.aws_assume_role_arn >> \
+              --role-session-name "${CIRCLE_WORKFLOW_ID}-<< parameters.session_context >>-tf" \
+              --web-identity-token $CIRCLE_OIDC_TOKEN \
+              --duration-seconds 3600 \
+              --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' \
+              --output text) > assume-tf.txt
+            read -r AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN < assume-tf.txt
+            export AWS_DEFAULT_REGION AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
             cd terraform/<< parameters.package >>
+            export TF_LOG="TRACE"
+            export TF_LOG_PATH="./terraform-debug.log"
             terraform plan -out=tfplan -input=false << parameters.terraform_arg >>
 
-  terraform_apply:
-    description: Run Terraform Apply
-    parameters:
-      package:
-        type: string
-    steps:
-      - run:
-          name: Terraform apply
-          command: |
-            source $BASH_ENV
-            cd terraform/<< parameters.package >>
-            terraform apply -lock=false -input=false tfplan
-
-  terraform_force_apply:
+  terraform_apply_oidc:
     description: Run Terraform Apply
     parameters:
-      package:
-        type: string
-    steps:
-      - run:
-          name: Terraform forced apply
-          command: |
-            source $BASH_ENV
-            cd terraform/<< parameters.package >>
-            terraform apply -auto-approve
-
-  aws_assume_role:
-    description: Assume AWS role
-    parameters:
-      aws_access_key_id:
-        description: AWS Access Key Id
-        type: string
-        default: "${AWS_ACCESS_KEY_ID}"
-      aws_secret_key:
-        description: AWS Secret Key
+      aws_region:
+        description: AWS Region
         type: string
-        default: "${AWS_SECRET_ACCESS_KEY}"
+        default: '${AWS_DEFAULT_REGION}'
       aws_assume_role_arn:
         description: AWS ARN For Assume Role
         type: string
-        default: "${AWS_ASSUME_ROLE_ARN}"
-      job_type:
-        description: The job type to be used
+        default: '${S3_AWS_ASSUME_ROLE_ARN}'
+      package:
         type: string
-        default: "default"
-    steps:
-      - run:
-          name: Assume role
-          command: |
-            export AWS_ACCESS_KEY_ID=<< parameters.aws_access_key_id >>
-            export AWS_SECRET_ACCESS_KEY=<< parameters.aws_secret_key >>
-            export temp_role=$(aws sts assume-role \
-                    --role-arn "<< parameters.aws_assume_role_arn >>" \
-                    --role-session-name "circle-ci-assume")
-            export AWS_ACCESS_KEY_ID_TEMP=$(echo $temp_role | jq .Credentials.AccessKeyId | xargs)
-            export AWS_SECRET_ACCESS_KEY_TEMP=$(echo $temp_role | jq .Credentials.SecretAccessKey | xargs)
-            export AWS_SESSION_TOKEN_TEMP=$(echo $temp_role | jq .Credentials.SessionToken | xargs)
-            echo "export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID_TEMP" >> $BASH_ENV
-            echo "export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY_TEMP" >> $BASH_ENV
-            echo "export AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN_TEMP" >> $BASH_ENV
-            source $BASH_ENV
-            cat $BASH_ENV | grep AWS_ACCESS_KEY_ID >> assume_role_creds_<< parameters.job_type >>.txt
-            cat $BASH_ENV | grep AWS_SECRET_ACCESS_KEY >> assume_role_creds_<< parameters.job_type >>.txt
-            cat $BASH_ENV | grep AWS_SESSION_TOKEN >> assume_role_creds_<< parameters.job_type >>.txt
-      - persist_to_workspace:
-          root: ./
-          paths:
-            - assume_role_creds_<< parameters.job_type >>.txt
-
-  aws_assume_role_file:
-    description: Assume AWS role from the workspace file
-    parameters:
-      job_type:
-        description: The job type to be used
+      session_context:
         type: string
-        default: "default"
-    steps:
-      - run:
-          name: Assume role file
-          command: |
-            cat assume_role_creds_<< parameters.job_type >>.txt >> $BASH_ENV
-            source $BASH_ENV
-
-  skip_if_infra_only_pr:
-    description: Skip PR job execution if only infrastructure was changed
+        default: s3
+      terraform_arg:
+        description: provide terraform arguments
+        type: string
+        default: ''
     steps:
       - run:
-          name: Skip if only infrastructure was changed
+          name: Terraform apply OIDC
           command: |
-            if git rev-parse --abbrev-ref HEAD | egrep -q '^(feat|fix)'; then
-              base_commit=`git merge-base origin/develop HEAD`
-              if ! git diff --name-only $base_commit | egrep -qv '^(eks|terraform)/'; then
-                echo "Skipping as only infrastructure has been changed"
-                circleci-agent step halt
-              fi
-            fi
+            export AWS_DEFAULT_REGION=<< parameters.aws_region >>
+            # use the OpenID Connect token to obtain AWS credentials
+            (aws sts assume-role-with-web-identity \
+              --role-arn << parameters.aws_assume_role_arn >> \
+              --role-session-name "${CIRCLE_WORKFLOW_ID}-<< parameters.session_context >>-tf" \
+              --web-identity-token $CIRCLE_OIDC_TOKEN \
+              --duration-seconds 3600 \
+              --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' \
+              --output text) > assume-tf.txt
+            read -r AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN < assume-tf.txt
+            export AWS_DEFAULT_REGION AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
+            cd terraform/<< parameters.package >>
+            export TF_LOG="TRACE"
+            export TF_LOG_PATH="./terraform-debug.log"
+            terraform apply -lock=false -input=false tfplan
 
+  # Best to remove "circleci-agent step halt" line while doing testing of CircleCI code
+  # to ensure that Terraform is validated at the pull_request stage
   run_only_on_folder_change:
     description: checks whether there is change on the folder in last two commits.
     parameters:
@@ -229,38 +264,174 @@ commands:
               circleci-agent step halt
             fi
 
+  checkout_and_attach_workspace:
+    description: 'Checkout the code and project files'
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+
+  run_test_visual_docs_percy:
+    description: 'Run the Percy tests for docs visual changes'
+    steps:
+      - run:
+          name: Install make
+          command: |
+            apt-get update
+            apt-get install -y make
+      - run:
+          name: Set percy/newskit-docsite token
+          command: echo "export PERCY_TOKEN=${PERCY_DOCSITE_TOKEN}" >> $BASH_ENV
+      - run:
+          name: Run Percy Docs Site Visual Tests
+          command: make e2e_visual_test_docs_percy
+      - store_artifacts:
+          path: cypress/screenshots
+
+  run_test_visual_comps_percy:
+    description: 'Run the Percy tests for comps visual changes'
+    steps:
+      - run:
+          name: Set percy/newskit-comps token
+          command: echo "export PERCY_TOKEN=${PERCY_COMPS_TOKEN}" >> $BASH_ENV
+      - run:
+          name: Run Percy Storybook Component Tests
+          command: make comps_visual_test_percy
+
+  skip_test_visual_comps_percy:
+    description: 'Run a single empty test to skip the comps visual changes suite'
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Set percy/newskit-comps token
+          command: echo "export PERCY_TOKEN=${PERCY_COMPS_TOKEN}" >> $BASH_ENV
+      - run:
+          name: 'Skip the required Percy check for the newskit-comps project'
+          command: yarn test:visual:comps:ci:percy:skip
+
+  skip_test_visual_docs_percy:
+    description: 'Run a single empty test to skip the docsite visual changes suite'
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Set percy/newskit-docsite token
+          command: echo "export PERCY_TOKEN=${PERCY_DOCSITE_TOKEN}" >> $BASH_ENV
+      - run:
+          name: 'Skip the required Percy check for the newskit-docsite project'
+          command: yarn e2e:visual:docs:ci:percy:skip
+
+  setup_cypress:
+    description: Restore and verify Cypress installation
+    steps:
+      - run:
+          name: Restore Cypress cache
+          command: |
+            if [ -d ~/project/.cache/Cypress ]; then
+              echo "Restoring Cypress cache from workspace..."
+              mkdir -p /root/.cache
+              cp -r ~/project/.cache/Cypress /root/.cache/
+            else
+              echo "No Cypress cache found, installing..."
+              npx cypress install
+            fi
+      - run:
+          name: Verify Cypress installation
+          command: npx cypress verify
+
 jobs:
-  install_deps:
-    working_directory: ~/project
+  can_i_merge_checker:
     executor: node
+    steps:
+      - run:
+          name: 'Check to make sure all tests have run before merging.'
+          command: echo 'passed'
+  install_deps:
+    executor: node-large
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - restore_cache:
           keys:
-            - yarn-build-{{ checksum "yarn.lock" }}
+            - yarn-build-v1-{{ checksum "yarn.lock" }}
+            - yarn-build-v1-
       - run:
           name: Dependencies Install
           command: make install
+      - run:
+          name: Build icons
+          command: make build_icons
       - save_cache:
-          key: yarn-build-{{ checksum "yarn.lock" }}
+          key: yarn-build-v1-{{ checksum "yarn.lock" }}
           paths:
-            - ~/.npm
             - ~/.cache
       - persist_to_workspace:
           root: ./
           paths:
             - node_modules/*
+            - fonts/private-fonts
             - src/version-number.json
-      - slack/status:
-          <<: *slack_status
+            - src/icons/*
+      - slack/notify:
+          <<: *slack_notify
+
+  install_cypress:
+    <<: *cypress_defaults
+    executor: cypress
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-cypress-{{ checksum "yarn.lock" }}
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Install make
+          command: |
+            # Google have updated their key, so we need to add it in order to install
+            # https://support.google.com/chrome/thread/409314457/linux-repo-error?hl=en
+            export GKEY=/tmp/google.pub
+            wget -q -O $GKEY https://dl.google.com/linux/linux_signing_key.pub
+            cat \<<+EOF >/etc/apt/sources.list.d/google-chrome.sources
+            Types: deb
+            URIs: https://dl.google.com/linux/chrome/deb/
+            Suites: stable
+            Components: main
+            Architectures: amd64
+            Enabled: yes
+            Signed-By:
+            $(sed -e 's/^/ /' $GKEY)
+            +EOF
+            rm -f $GKEY
+            apt-get update
+            apt-get install -y make
+      - run:
+          name: install cypress
+          command: |
+            make install_cypress
+      - save_cache:
+          key: v1-cypress-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache
+      - run:
+          name: Copy Cypress cache to workspace
+          command: |
+            # Create the cache directory in the workspace so it can be persisted
+            mkdir -p ~/project/.cache
+            cp -r /root/.cache/Cypress ~/project/.cache/ || echo "No Cypress cache to copy"
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - .cache/Cypress
+      - slack/notify:
+          <<: *slack_notify
 
   build_components:
-    working_directory: ~/project
-    executor: node
+    executor: node-large
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
@@ -270,15 +441,13 @@ jobs:
           root: ./
           paths:
             - dist/*
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
   build_storybook:
-    working_directory: ~/project
     executor: node
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
@@ -288,123 +457,143 @@ jobs:
           root: ./
           paths:
             - dist-storybook/*
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
   build_docs:
-    working_directory: ~/project
-    executor: node
+    executor: node-xlarge
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Build
+          command: |
+            export SITE_ENV=${SITE_ENV}
+            export SITE_BASE_URL=${SITE_BASE_URL}
+            make build_docs
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - public/*
+      - slack/notify:
+          <<: *slack_notify
+
+  build_docs_with_no_base_url:
+    executor: node-xlarge
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
           name: Build
-          command: make build_docs
+          command: |
+            export SITE_ENV=${SITE_ENV}
+            make build_docs_with_no_base_url
       - persist_to_workspace:
           root: ./
           paths:
             - public/*
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
   build_test_e2e:
-    working_directory: ~/project
-    executor: node
+    executor: node-xlarge
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
           name: Build E2E Tests
-          command: make e2e_test_build
+          command: yarn e2e:build
       - persist_to_workspace:
           root: ./
           paths:
             - e2e/dist/*
-      - slack/status:
-          <<: *slack_status
+            - cypress/config/a11y-components.json
+      - slack/notify:
+          <<: *slack_notify
 
   test_unit_comps:
-    working_directory: ~/project
-    executor: node-large
+    executor: node-xlarge
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
           name: Unit Testing
-          command: make unit_test_comps
+          command: yarn test:unit:comps:ci
           environment:
             JEST_JUNIT_OUTPUT_DIR: ./reports/junit/
       - store_test_results:
           path: ./reports/junit/
       - store_artifacts:
           path: ./reports/junit
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
   test_unit_docs:
-    working_directory: ~/project
-    executor: node-large
+    executor: node-xlarge
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
           name: Unit Testing
-          command: make unit_test_docs
+          command: yarn test:unit:docs:ci
           environment:
             JEST_JUNIT_OUTPUT_DIR: ./reports/junit/
+      - run:
+          name: Check component statuses match code tags
+          command: yarn test:comp-statuses
       - store_test_results:
           path: ./reports/junit/
       - store_artifacts:
           path: ./reports/junit
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
   lint:
-    working_directory: ~/project
     executor: node
     steps:
       - checkout
-      - skip_if_infra_only_pr
       - attach_workspace:
           at: ~/project
       - run:
           name: Lint
           command: make lint
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
+
+  test_broken_links_docs:
+    executor: node
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Broken Links
+          command: make check_broken_links_docs
+      - slack/notify:
+          <<: *slack_notify
 
   init_aws:
     parameters:
       job_type:
         type: string
-        default: "default"
-    working_directory: ~/project
-    executor: python
+        default: 'default'
+    executor: aws-cli-and-terraform
     steps:
       - checkout
       - attach_workspace:
           at: ~/project
-      - run:
-          name: Install aws cli
-          command: sudo pip install awscli
-      - aws_assume_role:
-          job_type: << parameters.job_type >>
+      - slack/notify:
+          <<: *slack_notify
 
-  deploy_terraform:
+  deploy_terraform_oidc:
     parameters:
       package:
         type: string
-      akamai:
-        type: boolean
-        default: false
       apply:
         type: boolean
         default: true
@@ -413,222 +602,183 @@ jobs:
         default: true
       environment:
         type: string
-        default: ""
-    working_directory: ~/project
-    executor: terraform
+        default: ''
+    executor: aws-cli-and-terraform
     steps:
-      - add_ssh_keys:
-          fingerprints: "7b:19:47:48:3c:27:a2:d2:fa:59:87:d5:7a:ce:ce:80"
       - checkout
       - attach_workspace:
           at: ~/project
       - run_only_on_folder_change:
           folder: ./terraform/<< parameters.package >>
-      - when:
-          condition: << parameters.akamai >>
-          steps:
-            - run:
-                name: Setup akamai
-                command: |
-                  echo "[default]
-                  client_secret = ${AKAMAI_SECRET}
-                  host = ${AKAMAI_HOST}
-                  access_token = ${AKAMAI_ACCESS_TOKEN}
-                  client_token = ${AKAMAI_CLIENT_TOKEN}
-                  [papi]
-                  client_secret = ${AKAMAI_SECRET}
-                  host = ${AKAMAI_HOST}
-                  access_token = ${AKAMAI_ACCESS_TOKEN}
-                  client_token = ${AKAMAI_CLIENT_TOKEN}" > ~/.edgerc
-      - aws_assume_role_file
       - when:
           condition: << parameters.tf_env >>
           steps:
-            - terraform_init:
+            - terraform_init_oidc:
                 package: << parameters.package >>
-                terraform_arg: -backend-config="key=product-platforms/newskit/<< parameters.package >>/<< parameters.environment >>/terraform.tfstate"
-            - terraform_plan:
+                terraform_arg: -backend-config="key=newskit/<< parameters.package >>/<< parameters.environment >>/terraform.tfstate"
+            - terraform_plan_oidc:
                 package: << parameters.package >>
                 terraform_arg: -var-file=<< parameters.environment >>.tfvars
       - unless:
           condition: << parameters.tf_env >>
           steps:
-            - terraform_init:
+            - terraform_init_oidc:
                 package: << parameters.package >>
-                terraform_arg: -backend-config="key=product-platforms/newskit/<< parameters.package >>/terraform.tfstate"
-            - terraform_plan:
+                terraform_arg: -backend-config="key=newskit/<< parameters.package >>/terraform.tfstate"
+            - terraform_plan_oidc:
                 package: << parameters.package >>
       - when:
           condition: << parameters.apply >>
           steps:
-            - terraform_apply:
+            - terraform_apply_oidc:
                 package: << parameters.package >>
 
-  test_visual_comps:
-    working_directory: ~/project
+  test_visual_comps_percy:
     executor: node-large
     steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Install Headless Chrome dependencies
-          command: >
-            sudo apt-get install -yq \
+      - checkout_and_attach_workspace
+      - run_test_visual_comps_percy
 
-            gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2
-            libcups2 libdbus-1-3 \
+  comps_tests_conditional_run_to_update_baselines:
+    # if there are any visual diffs we need to run the Percy comps tests to update the baselines
+    executor: node-large
+    steps:
+      - checkout_and_attach_workspace
+      - github-cli/setup
+      - run:
+          name: 'Check if updates required'
+          command: |
+            {
+                export PR_BRANCH_NAME=$(gh pr list --search $CIRCLE_SHA1 --state merged --json headRefName --jq '.[].headRefName') &&
+                echo "Found branch name: ${PR_BRANCH_NAME}" &&
+                node scripts/check-baseline-updates.js $PR_BRANCH_NAME "comps" &&
+                echo "No baseline updates required; finishing job." &&
+                circleci-agent step halt
+            } || {
+                echo "Baseline updates required; continuing job."
+            }
+      - run_test_visual_comps_percy
+      - slack/notify:
+          <<: *slack_notify
 
-            libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0
-            libglib2.0-0 libgtk-3-0 libnspr4 \
+  docsite_tests_conditional_run_to_update_baselines:
+    # if there are any visual diffs we need to run the Percy docsite tests to update the baselines
+    <<: *cypress_defaults
+    executor: cypress
+    steps:
+      - checkout_and_attach_workspace
+      - github-cli/setup
+      - run:
+          name: 'Check if updates required'
+          command: |
+            {
+                export PR_BRANCH_NAME=$(gh pr list --search $CIRCLE_SHA1 --state merged --json headRefName --jq '.[].headRefName') &&
+                echo "Found branch name: ${PR_BRANCH_NAME}" &&
+                node scripts/check-baseline-updates.js $PR_BRANCH_NAME "docsite" &&
+                echo "No baseline updates required; finishing job." &&
+                circleci-agent step halt
+            } || {
+                echo "Baseline updates required; continuing job."
+            }
+      - run_test_visual_docs_percy
+      - slack/notify:
+          <<: *slack_notify
 
-            libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1
-            libxcb1 libxcomposite1 libxcursor1 \
+  skip_percy_comps_check:
+    executor: node
+    steps:
+      - skip_test_visual_comps_percy
 
-            libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1
-            libxtst6 ca-certificates \
+  skip_percy_comps_check_2:
+    executor: node
+    steps:
+      - skip_test_visual_comps_percy
 
-            fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
-      - run:
-          name: "Setup Applitools environment variables"
-          <<: *applitools_defaults
-      - run:
-          name: Run Applitools Storybook Component Tests
-          command: make comps_visual_test
-      - run:
-          name: Close the Applitools Batch
-          command: curl --request DELETE --dump-header - "https://eyesapi.applitools.com/api/sessions/batches/$APPLITOOLS_BATCH_ID/close/bypointerid/?apiKey=$APPLITOOLS_API_KEY"
-      - slack/status:
-          <<: *slack_status
+  skip_percy_docsite_check:
+    <<: *cypress_defaults
+    executor: cypress
+    steps:
+      - skip_test_visual_docs_percy
 
-  install_cypress:
-    working_directory: ~/project
+  test_visual_docs_percy:
+    <<: *cypress_defaults
     executor: cypress
     steps:
-      - checkout
-      - skip_if_infra_only_pr
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: install cypress
-          command: make install_cypress
-      - save_cache:
-          key: v1-cypress-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/Cypress
-      - slack/status:
-          <<: *slack_status
+      - checkout_and_attach_workspace
+      - run_test_visual_docs_percy
 
-  test_visual_docs:
-    working_directory: ~/project
+  test_visual_docs_percy_2:
+    <<: *cypress_defaults
     executor: cypress
     steps:
-      - checkout
-      - skip_if_infra_only_pr
-      - restore_cache:
-          keys:
-            - v1-cypress-{{ checksum "yarn.lock" }}
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: "Setup Applitools environment variables"
-          <<: *applitools_defaults
-      - run:
-          name: Run Applitools Docs Site Visual Tests
-          command: make e2e_visual_test_docs
-      - run:
-          name: Close the Applitools Batch
-          command: curl --request DELETE --dump-header - "https://eyesapi.applitools.com/api/sessions/batches/$APPLITOOLS_BATCH_ID/close/bypointerid/?apiKey=$APPLITOOLS_API_KEY"
-      - store_artifacts:
-          path: cypress/screenshots
-      - store_artifacts:
-          path: cypress/videos
-      - slack/status:
-          <<: *slack_status
+      - checkout_and_attach_workspace
+      - run_test_visual_docs_percy
 
   test_e2e_comps:
-    working_directory: ~/project
+    <<: *cypress_defaults
     executor: cypress
+    parallelism: 10
     steps:
-      - checkout
-      - skip_if_infra_only_pr
-      - restore_cache:
-          keys:
-            - v1-cypress-{{ checksum "yarn.lock" }}
-      - attach_workspace:
-          at: ~/project
+      - checkout_and_attach_workspace
+      - setup_cypress
       - run:
           name: Run Component Tests
-          command: make e2e_test_comps
+          command: yarn e2e:comps:ci
       - store_artifacts:
           path: cypress/screenshots
       - store_artifacts:
           path: cypress/videos
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
   test_e2e_docs:
-    working_directory: ~/project
+    <<: *cypress_defaults
     executor: cypress
+    parallelism: 16
     steps:
-      - checkout
-      - skip_if_infra_only_pr
-      - restore_cache:
-          keys:
-            - v1-cypress-{{ checksum "yarn.lock" }}
-      - attach_workspace:
-          at: ~/project
+      - checkout_and_attach_workspace
+      - setup_cypress
       - run:
           name: Run Docs Site Functional Tests
-          command: |
-            make e2e_test_docs
+          command: yarn e2e:docs:ci
       - store_artifacts:
           path: cypress/screenshots
       - store_artifacts:
           path: cypress/videos
-      - slack/status:
-          <<: *slack_status
-
-  copy_dev_baselines_to_master:
-    working_directory: ~/project
-    executor: java
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Copy Dev Baselines to Master
-          command: |
-            curl -L "https://dl.bintray.com/applitoolseyes/generic/EyesUtilities_1.3.1.jar" -o EyesUtilities_1.3.1.jar
-            java -jar EyesUtilities_1.3.1.jar copyBaselines -s develop -t master -k ${APPLITOOLS_API_KEY_WITH_MERGE_CREDENTIALS}
+      - slack/notify:
+          <<: *slack_notify
 
-  create_release_candidate:
-    working_directory: ~/project
+  bump_version:
     executor: node
+    parameters:
+      version:
+        type: string
     steps:
       - checkout
-      - run:
-          name: install hub
-          command: make install_hub
-      - add_ssh_keys:
-          fingerprints: "7b:19:47:48:3c:27:a2:d2:fa:59:87:d5:7a:ce:ce:80"
       - run:
           name: Set github identity
           command: make set_git_identity
       - run:
-          name: bump version
-          command: make create_release_candidate
+          name: Bump version
+          command: make bump_version NEW_VERSION=<< parameters.version >>
+      - slack/notify:
+          <<: *slack_notify
+
+  delete_trigger_release_tag:
+    executor: node
+    parameters:
+      version:
+        type: string
+    steps:
+      - checkout
+      - run:
+          name: Set github identity
+          command: make set_git_identity
       - run:
-          name: export version
-          command: |
-            export VERSION=$(jq -r .version package.json)
-            echo "export VERSION=${VERSION}" >> $BASH_ENV
-      - slack/status:
-          <<: *slack_status
+          name: Delete trigger-release@ tag
+          command: make delete_trigger_release_tag VERSION=<< parameters.version >>
       - slack/notify:
-          color: "#42e2f4"
-          channel: '#nuk-pp-newskit'
-          message: "Hi all, \n We are about to deploy ${VERSION}. The release note can be found here: https://nidigitalsolutions.jira.com/projects/PPDSC?orderField=RANK&selectedItem=com.atlassian.jira.jira-projects-plugin%3Arelease-page&status=no-filter&contains=${VERSION}"
+          <<: *slack_notify
 
   publish_npm:
     parameters:
@@ -658,470 +808,932 @@ jobs:
             - run:
                 name: Publish components to NPM
                 command: make publish_npm
-      - slack/status:
-          <<: *slack_status
+      - slack/notify:
+          <<: *slack_notify
 
-  build_push_docker_ecr:
+  # Paths are passed in, so covers both subfolders for PR env and root for other envs
+  push_s3_general_oidc:
     parameters:
       aws_region:
         description: AWS Region
         type: string
-        default: "${AWS_DEFAULT_REGION}"
-      aws_access_key_id:
-        description: AWS Access Key Id
+        default: '${AWS_DEFAULT_REGION}'
+      aws_assume_role_arn:
+        description: AWS ARN For Assume Role
+        type: string
+        default: '${S3_AWS_ASSUME_ROLE_ARN}'
+      s3Path_docs:
         type: string
-        default: "${AWS_ACCESS_KEY_ID}"
-      aws_secret_key:
-        description: AWS Secret Key
+      s3Path_storybook:
         type: string
-        default: "${AWS_SECRET_ACCESS_KEY}"
-      aws_ecr_url:
-        description: AWS Account URL
+    executor: aws-cli-and-terraform
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - aws-cli/setup:
+          role-arn: << parameters.aws_assume_role_arn >>
+          profile-name: 'NEWSKIT-OIDC-PROFILE'
+          role-session-name: '${CIRCLE_WORKFLOW_ID}-s3-push'
+      - run:
+          name: Upload sites to given S3 paths
+          command:
+            | # output current date time to a HTML file to allow a in-browser that check CDN does not return old files
+            export AWS_DEFAULT_REGION=<< parameters.aws_region >>
+            export s3Path_docs=<< parameters.s3Path_docs >>
+            export s3Path_storybook=<< parameters.s3Path_storybook >>
+            echo "${SITE_ENV} $(date)" > timestamp.html
+            aws s3 cp public $s3Path_docs --recursive
+            aws s3 cp timestamp.html $s3Path_docs
+            aws s3 cp dist-storybook $s3Path_storybook --recursive
+            aws s3 cp timestamp.html $s3Path_storybook
+      - slack/notify:
+          <<: *slack_notify
+
+  push_s3_pr_oidc:
+    parameters:
+      aws_region:
+        description: AWS Region
         type: string
-        default: "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com"
+        default: '${AWS_DEFAULT_REGION}'
       aws_assume_role_arn:
         description: AWS ARN For Assume Role
         type: string
-        default: "${AWS_ASSUME_ROLE_ARN}"
-      ecr_repo:
-        description: ECR REPO
-        type: string
-        default: "${AWS_RESOURCE_NAME_PREFIX}"
-      docker_version:
-        description: Docker Image Tag
-        type: string
-        default: "dev"
-    executor: node
+        default: '${S3_AWS_ASSUME_ROLE_ARN}'
+    executor: aws-cli-and-terraform
     steps:
       - checkout
       - attach_workspace:
           at: ~/project
-      - setup_remote_docker
+      - aws-cli/setup:
+          role-arn: << parameters.aws_assume_role_arn >>
+          profile-name: 'NEWSKIT-OIDC-PROFILE'
+          role-session-name: '${CIRCLE_WORKFLOW_ID}-s3-push'
+      - node/install:
+          install-yarn: false
+          node-version: '16.13'
       - run:
-          name: Install python and pip
+          name: Upload PR sites to S3 subfolders
           command: |
-                    sudo apt-get update
-                    sudo apt-get install python-pip python-dev
-      - run:
-          name: Install awscli
-          command: sudo pip install awscli
+            export AWS_DEFAULT_REGION=<< parameters.aws_region >>
+            export s3Path_docs=$(node scripts/s3-pr-branch-naming.js ${CIRCLE_BRANCH} 's3://ncu-newskit-docs-pr/')
+            echo "${SITE_ENV} $(date)" > timestamp.html
+            aws s3 cp public $s3Path_docs --recursive
+            aws s3 cp timestamp.html $s3Path_docs
+            export s3Path_storybook=$(node scripts/s3-pr-branch-naming.js ${CIRCLE_BRANCH} 's3://ncu-newskit-docs-pr/' 'storybook/')
+            echo $s3Path_storybook
+            aws s3 cp dist-storybook $s3Path_storybook --recursive
+            aws s3 cp timestamp.html $s3Path_storybook
+      - slack/notify:
+          <<: *slack_notify
+
+  post_pr_env_url_to_github_pr:
+    executor: node
+    steps:
+      - checkout
+      - github-cli/setup
       - run:
-          name: Assume role and build docker images
+          name: Doc site link
           command: |
-            if [ << parameters.docker_version >> = release ]; then
-              export DOCKER_TAG=$(node -p "require('./package.json').version")
+            if gh pr view -c | grep "Documentation Site" ;
+            then
+              circleci-agent step halt
             else
-              export DOCKER_TAG=${CIRCLE_SHA1}
+              gh pr comment --body "You can preview these changes on:
+              Documentation Site: $(node scripts/pr_comment_link.js ${CIRCLE_BRANCH} 'http://ncu-newskit-docs-pr.s3-website-eu-west-1.amazonaws.com/' 'docs')
+              Storybook: $(node scripts/pr_comment_link.js ${CIRCLE_BRANCH} 'http://ncu-newskit-docs-pr.s3-website-eu-west-1.amazonaws.com/' 'storybook')"
             fi
-            export AWS_ACCESS_KEY_ID=<< parameters.aws_access_key_id >>
-            export AWS_SECRET_ACCESS_KEY=<< parameters.aws_secret_key >>
-            export DOCKER_REGISTRY_URL=<< parameters.aws_ecr_url >>
-            export DOCKER_REPO=<< parameters.ecr_repo >>
-            export temp_role=$(aws sts assume-role \
-                    --role-arn "<< parameters.aws_assume_role_arn >>" \
-                    --role-session-name "circle-ci-assume")
-            export AWS_ACCESS_KEY_ID=$(echo $temp_role | jq .Credentials.AccessKeyId | xargs)
-            export AWS_SECRET_ACCESS_KEY=$(echo $temp_role | jq .Credentials.SecretAccessKey | xargs)
-            export AWS_SESSION_TOKEN=$(echo $temp_role | jq .Credentials.SessionToken | xargs)
-            aws ecr get-login --no-include-email --region << parameters.aws_region >> | /bin/bash
-            make build_docker
-            make push_docker
-      - slack/status:
-          <<: *slack_status
-
-  eks_flux_deploy:
-    # This one does a Flux deployment (writes to a Flux repo), using the flux-k8s tool you can find in https://github.com/newscorp-ghfb/ncu-circle-pipeline
-    parameters:
-      environment:
-        type: string
-      substitution_dir:
-        type: string
-        default: "eks/manifests"
-      flux_repo_url:
-        type: string
-        default: "git@github.com:newscorp-ghfb/ncu-flux-newskit-site.git"
-      flux_repo_name:
-        type: string
-        default: "ncu-flux-newskit-site"
-    executor: flux-deploy
+      - slack/notify:
+          <<: *slack_notify
+
+  validate_terraform:
+    executor: node
+    steps:
+      - run:
+          name: Terraform is valid
+          command: |
+            echo "If you see this message, it means all the Terraform is valid"
+
+  test_newskit_in_nextjs_app:
+    executor: cypress
     steps:
-      - setup_remote_docker
       - checkout
-        # We have to add the ssh key so that Circle has permissions to checkout the private repo
-      - add_ssh_keys:
-          fingerprints: "7b:19:47:48:3c:27:a2:d2:fa:59:87:d5:7a:ce:ce:80"
+      - attach_workspace:
+          at: ~/project
       - run:
-          name: Push config to flux repo
+          name: Install yalc and create-next-app
           command: |
-            apk add --update npm
-            if [ << parameters.environment >> = dev ]; then
-              export DOCKER_TAG=${CIRCLE_SHA1}
-            else
-              export DOCKER_TAG=$(node -p "require('./package.json').version")
-            fi
-            config_values=eks/values/product-platforms-values-<< parameters.environment >>.yaml
-            out_dir=product-platforms-<< parameters.environment >>
-            flux_repo_target=<< parameters.environment >>/eks
-            git config --global user.email "ncu-product-platforms@news.co.uk"
-            git config --global user.name "Product Platforms Service"
-            flux-generate "${CIRCLE_SHA1}" $config_values << parameters.substitution_dir >> $out_dir
-            flux-commit -u << parameters.flux_repo_url >> -n << parameters.flux_repo_name >> -d $out_dir -t $flux_repo_target -m "${CIRCLE_SHA1}_$out_dir"
-      - slack/status:
-          <<: *slack_status
-
-  eks_kubectl_deploy:
+            yarn global add yalc && yarn add create-next-app@13.3.1
+      - run:
+          name: Yalc publish and run create-nextjs-app
+          command: |
+            cd dist
+            yalc publish
+            cd ..
+            npx create-next-app@13.3.1 newskit-integration-test --no-eslint
+      - run:
+          name: Prepare the NextJs app
+          command: |
+            echo "Adding needed files into the NextJs app"
+
+            cp ./scripts/templates-integration-test/index.txt ./newskit-integration-test/pages/index.js
+            cp ./scripts/templates-integration-test/cypress.config.js ./newskit-integration-test/
+            cp ./scripts/templates-integration-test/next.config.js ./newskit-integration-test/
+            cp -R ./scripts/templates-integration-test/cypress ./newskit-integration-test
+
+            echo "Installing needed packages into the NextJS app"
+
+            cd newskit-integration-test
+            yalc add newskit
+            yarn add start-server-and-test
+            yarn add react@18.2
+            yarn add react-dom@18.2
+            yarn add @emotion/react
+            yarn add @emotion/styled
+            yarn add -D cypress@12.11.0
+      - run:
+          name: Serve and test app with Cypress
+          command: |
+            cd newskit-integration-test
+            yarn build
+            yarn start-test start 3000 'yarn cypress run'
+      - slack/notify:
+          <<: *slack_notify
+
+  # ========== CODEMOD RELATED JOBS    ==========
+
+  install_deps_codemod:
+    executor: node
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - yarn-build-v1-codemod-{{ checksum "lib/codemod/yarn.lock" }}
+            - yarn-build-v1-codemod-
+      - run:
+          name: Codemode Dependencies Install
+          command: cd lib/codemod && make install
+      - save_cache:
+          key: yarn-build-v1-codemod-{{ checksum "lib/codemod/yarn.lock" }}
+          paths:
+            - ~/.cache
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - lib/codemod/node_modules/*
+      - slack/notify:
+          <<: *slack_notify
+
+  lint_codemod:
+    executor: node
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Lint Codemod
+          command: cd lib/codemod && make lint
+      - slack/notify:
+          <<: *slack_notify
+
+  test_unit_codemod:
+    executor: node
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Unit Testing Codemod
+          command: cd lib/codemod && make unit_test
+          environment:
+            JEST_JUNIT_OUTPUT_DIR: ./reports/codemod-junit/
+      - store_test_results:
+          path: ./reports/codemod-junit/
+      - store_artifacts:
+          path: ./reports/codemod-junit
+      - slack/notify:
+          <<: *slack_notify
+
+  publish_npm_codemod:
     parameters:
-      environment:
-        type: string
-        description: Deplyoment environment
-      aws_region:
-        description: AWS Region
-        type: string
-        default: "${AWS_DEFAULT_REGION}"
-      aws_access_key_id:
-        description: AWS Access Key Id
-        type: string
-        default: "${AWS_ACCESS_KEY_ID}"
-      aws_secret_key:
-        description: AWS Secret Key
-        type: string
-        default: "${AWS_SECRET_ACCESS_KEY}"
-      aws_assume_role_arn:
-        description: AWS ARN For Assume Role
-        type: string
-        default: "${AWS_ASSUME_ROLE_ARN}"
-      notify:
-        description: Send slack notification
+      publish_dev:
         type: boolean
         default: false
-    executor: kubectl-deploy
+    executor: node
     steps:
       - checkout
-      - setup_remote_docker
-      - add_ssh_keys:
-          fingerprints: "7b:19:47:48:3c:27:a2:d2:fa:59:87:d5:7a:ce:ce:80"
+      - attach_workspace:
+          at: ~/project
       - run:
-          name: Deploy to EKS
-          command: |
-            apk --no-cache add openssh git bash
-            export GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no"
-            git config --global user.email "ncu-product-platforms@news.co.uk"
-            git config --global user.name "Product Platforms Service"
-            git clone git@github.com:newscorp-ghfb/ncu-flux-newskit-site.git flux
-            export EKS_IAM_ROLE_DEV=<< parameters.aws_assume_role_arn >>
-            export EKS_AWS_ACCESS_KEY_ID=<< parameters.aws_access_key_id >>
-            export EKS_AWS_SECRET_ACCESS_KEY=<< parameters.aws_secret_key >>
-            export AWS_DEFAULT_REGION=<< parameters.aws_region >>
-            export CLUSTER_NAME=ceng-eks-<< parameters.environment >>
-            export VERSION=$(jq -r .version package.json)
-            echo "export VERSION=${VERSION}" >> $BASH_ENV
-
-            nukubectl | grep "export AWS_" > auth.env
-            export $(egrep -v '^#' auth.env | xargs)
-            rm auth.env
-
-            cd flux/<< parameters.environment >>/eks
-            kubectl apply -f .
-      - slack/status:
-          <<: *slack_status
+          name: Add NPM login credentionals
+          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+      - run:
+          name: Set github identity
+          command: cd lib/codemod && make set_git_identity
       - when:
-          condition: << parameters.notify >>
+          condition: << parameters.publish_dev >>
           steps:
-            - slack/notify:
-                color: "#42e2f4"
-                channel: '#newskit'
-                message: "Hi all, \n ${VERSION} has now been successfully deployed to << parameters.environment >>. The release note can be found here: https://nidigitalsolutions.jira.com/projects/PPDSC?orderField=RANK&selectedItem=com.atlassian.jira.jira-projects-plugin%3Arelease-page&status=no-filter&contains=${VERSION}"
+            - run:
+                name: Publish codemod to NPM
+                command: cd lib/codemod && make publish_npm_dev
+      - unless:
+          condition: << parameters.publish_dev >>
+          steps:
+            - run:
+                name: Publish codemod to NPM
+                command: cd lib/codemod && make publish_npm;
+      - slack/notify:
+          <<: *slack_notify
 
-# ========== FILTERS START    ==========
+  bump_version_codemod:
+    executor: node
+    parameters:
+      version:
+        type: string
+    steps:
+      - checkout
+      - run:
+          name: Set github identity
+          command: cd lib/codemod && make set_git_identity
+      - run:
+          name: Bump version
+          command: cd lib/codemod && make bump_version NEW_VERSION=<< parameters.version >>
+      - slack/notify:
+          <<: *slack_notify
 
-only_develop: &only_develop
-  filters:
-    branches:
-      only: develop
+  delete_trigger_release_tag_codemod:
+    executor: node
+    parameters:
+      version:
+        type: string
+    steps:
+      - checkout
+      - run:
+          name: Set github identity
+          command: cd lib/codemod && make set_git_identity
+      - run:
+          name: Delete trigger-release-codemod@ tag
+          command: cd lib/codemod && make delete_trigger_release_tag VERSION=<< parameters.version >>
+      - slack/notify:
+          <<: *slack_notify
 
-only_trigger_release: &only_trigger_release
-  filters:
-    branches:
-      only: /trigger-release-.*/
+  merge_checker:
+    executor: node
+    steps:
+      - run: echo "Merge checker"
 
-only_release: &only_release
-  filters:
-    branches:
-      only: /^release.*/
+# ========== FILTERS START    ==========
 
-only_master: &only_master
+only_on_trigger_release_tag: &only_on_trigger_release_tag
   filters:
+    tags:
+      # The pattern must match the tag created in the github release interface. E.g: "trigger-release@5.0.1"
+      only: /^trigger-release@([0-9])(\.([0-9])){2}$/
     branches:
-      only: master
+      ignore: /.*/
 
-only_pr: &only_pr
+only_on_version_tag: &only_on_version_tag
   filters:
+    tags:
+      # The pattern must match the tag created and pushed by bump_version make script. E.g: "v5.0.1"
+      only: /^v([0-9])(\.([0-9])){2}$/
     branches:
-      ignore:
-        - develop
-        - master
-        - /trigger-release-.*/
-        - /^release.*/
+      ignore: /.*/
 
-only_pr_and_release: &only_pr_and_release
+only_on_trigger_release_tag_codemod: &only_on_trigger_release_tag_codemod
   filters:
+    tags:
+      # The pattern must match the tag created in the github release interface. E.g: "trigger-release-codemod@5.0.1"
+      only: /^trigger-release-codemod@([0-9])(\.([0-9])){2}$/
     branches:
-      ignore:
-        - develop
-        - master
-        - /trigger-release-.*/
+      ignore: /.*/
 
-ignore_trigger_release: &ignore_trigger_release
+only_on_version_tag_codemod: &only_on_version_tag_codemod
   filters:
+    tags:
+      # The pattern must match the tag created and pushed by bump_version_codemod make script. E.g: "codemod-v5.0.1"
+      only: /^codemod-v([0-9])(\.([0-9])){2}$/
     branches:
-      ignore:
-        - /trigger-release-.*/
+      ignore: /.*/
 
 # ========== FILTERS END        ==========
 
-# ========== REQUIREMENTS START ==========
-
-require_dep: &require_dep
-  requires:
-    - install_deps
-
-# ========== REQUIREMENTS END   ==========
-
 workflows:
-  build_and_deploy:
+  pull_request:
+    when:
+      matches:
+        # Supporting Pr branches starting with feat/, docs/, fix/, chore/, style/, refactor/, perf/, test/, etc.
+        pattern: '^build\/.*|chore\/.*|ci\/.*|docs\/.*|feat\/.*|fix\/.*|improvement\/.*|perf\/.*|refactor\/.*|revert.*\/.*|style\/.*|test\/.*|^dependabot\/.*|^snyk-upgrade.*'
+        value: << pipeline.git.branch >>
     jobs:
-    # common jobs
-      - install_deps:
-          <<: *ignore_trigger_release
-      - install_cypress:
-          <<: *ignore_trigger_release
+      - install_deps
+      - install_cypress
       - build_components:
-          <<: *ignore_trigger_release
-          <<: *require_dep
+          requires:
+            - install_deps
       - build_storybook:
-          <<: *ignore_trigger_release
-          <<: *require_dep
-      - build_docs:
-          <<: *ignore_trigger_release
-          <<: *require_dep
           requires:
-            - build_components
+            - install_deps
       - build_test_e2e:
-          <<: *ignore_trigger_release
-          <<: *require_dep
+          requires:
+            - install_deps
       - lint:
-          <<: *ignore_trigger_release
-          <<: *require_dep
+          requires:
+            - install_deps
       - test_unit_comps:
-          <<: *ignore_trigger_release
-          <<: *require_dep
+          requires:
+            - install_deps
       - test_unit_docs:
-          <<: *ignore_trigger_release
-          <<: *require_dep
+          requires:
+            - install_deps
+      - test_newskit_in_nextjs_app:
+          requires:
+            - build_components
       - test_e2e_comps:
-          <<: *ignore_trigger_release
           context: ncu-product-platforms-context
           requires:
             - build_test_e2e
             - install_cypress
+      - build_docs_with_no_base_url:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - test_broken_links_docs:
+          name: test_broken_links_docs_pr
+          context: ncu-product-platforms-context
+          requires:
+            - build_docs_with_no_base_url
       - test_e2e_docs:
-          <<: *ignore_trigger_release
+          name: test_e2e_docs_pr
           context: ncu-product-platforms-context
           requires:
-            - build_docs
+            - build_docs_with_no_base_url
             - install_cypress
-    # PR jobs
-      - run_visual_comps:
-          <<: *only_pr_and_release
+            - build_storybook
+      - no_visual_changes:
           type: approval
           requires:
             - build_storybook
-      - test_visual_comps:
-          <<: *only_pr_and_release
+            - install_cypress
+      - docs_and_comps_visual_changes:
+          type: approval
+          requires:
+            - build_storybook
+            - install_cypress
+      - docs_visual_changes:
+          type: approval
+          requires:
+            - build_storybook
+            - install_cypress
+
+      # Jobs for realising unstable NPM version
+      - approve_publish_npm_pr:
+          type: approval
+          requires:
+            - test_newskit_in_nextjs_app
+            - lint
+            - test_unit_comps
+            - test_unit_docs
+            - test_e2e_comps
+            - test_e2e_docs_pr
+      - publish_npm:
+          name: publish_npm_pr
           context: ncu-product-platforms-context
+          publish_dev: true
           requires:
-            - run_visual_comps
-      - init_aws:
-          <<: *ignore_trigger_release
+            - approve_publish_npm_pr
+      # End jobs for releasing unstable NPM version
+
+      - skip_percy_comps_check:
           context: ncu-product-platforms-context
-      - deploy_terraform:
-          <<: *only_pr
-          name: deploy_terraform_akamai_pr
-          package: akamai
+          requires:
+            - no_visual_changes
+      - skip_percy_docsite_check:
           context: ncu-product-platforms-context
-          akamai: true
-          apply: false
-          environment: dev
           requires:
-            - init_aws
-      - deploy_terraform:
-          <<: *only_pr
-          name: deploy_terraform_dns_pr
-          package: dns
+            - no_visual_changes
+      - test_visual_comps_percy:
           context: ncu-product-platforms-context
-          apply: false
-          environment: dev
           requires:
-            - init_aws
-      - deploy_terraform:
-          <<: *only_pr
-          name: deploy_terraform_ecr_pr
-          package: ecr
+            - docs_and_comps_visual_changes
+      - test_visual_docs_percy:
           context: ncu-product-platforms-context
-          apply: false
-          tf_env: false
           requires:
-            - init_aws
-    # develop jobs
-      - test_visual_docs:
-          <<: *only_develop
+            - build_docs_with_no_base_url
+            - install_cypress
+            - docs_and_comps_visual_changes
+      - test_visual_docs_percy_2:
           context: ncu-product-platforms-context
           requires:
-            - build_docs
+            - build_docs_with_no_base_url
             - install_cypress
-      - approve_publish_npm_dev:
-          type: approval
-      - publish_npm:
-          name: publish_npm_dev
+            - docs_visual_changes
+      - skip_percy_comps_check_2:
           context: ncu-product-platforms-context
-          publish_dev: true
           requires:
-            - approve_publish_npm_dev
-      - build_push_docker_ecr:
-          name: build_push_docker_ecr_dev
+            - docs_visual_changes
+      - can_i_merge_checker:
           context: ncu-product-platforms-context
-          <<: *only_develop
           requires:
-            - build_storybook
+            - test_newskit_in_nextjs_app
             - lint
             - test_unit_comps
             - test_unit_docs
             - test_e2e_comps
-            - test_e2e_docs
-      - eks_flux_deploy:
-          name: eks_flux_deploy_dev
-          context: ncu-newskit-site-dev
-          environment: dev
-          <<: *only_develop
+            - test_e2e_docs_pr
+            - test_broken_links_docs_pr
+      - init_aws:
+          context: ncu-product-platforms-context
+      - deploy_terraform_oidc:
+          name: deploy_terraform_s3_pr
+          package: s3/dev-newskit
+          context: ncu-newskit-site-pr
+          apply: true
+          tf_env: false
+          environment: pr
           requires:
-            - build_push_docker_ecr_dev
-      - eks_kubectl_deploy:
-          name: eks_kubectl_deploy_dev
+            - init_aws
+      - deploy_terraform_oidc:
+          name: validate_deploy_terraform_s3_dev
+          package: s3/dev-newskit
           context: ncu-newskit-site-dev
+          apply: false # Can set true while doing testing of CircleCI code
+          tf_env: true
           environment: dev
-          <<: *only_develop
           requires:
-            - eks_flux_deploy_dev
-      - deploy_terraform:
-          <<: *only_develop
-          name: deploy_terraform_akamai_dev
-          package: akamai
-          context: ncu-product-platforms-context
-          akamai: true
-          environment: dev
+            - init_aws
+      - deploy_terraform_oidc:
+          name: validate_deploy_terraform_s3_staging
+          package: s3/prod-newskit
+          context: ncu-newskit-site-stage
+          apply: false # Can set true while doing testing of CircleCI code
+          tf_env: true
+          environment: staging
+          requires:
+            - init_aws
+      - deploy_terraform_oidc:
+          name: validate_deploy_terraform_s3_prod
+          package: s3/prod-newskit
+          context: ncu-newskit-site-prod
+          apply: false # Can set true while doing testing of CircleCI code
+          tf_env: true
+          environment: prod
           requires:
             - init_aws
-      - deploy_terraform:
-          <<: *only_develop
-          name: deploy_terraform_dns_dev
-          package: dns
+      - build_docs:
+          name: build_docs_pr
+          context: ncu-newskit-site-pr
+          requires:
+            - install_deps
+      - push_s3_pr_oidc:
+          name: deploy_to_s3_pr
+          context: ncu-newskit-site-pr
+          requires:
+            - deploy_terraform_s3_pr
+            - build_docs_pr
+            - build_storybook
+      - post_pr_env_url_to_github_pr:
+          name: pr_enviroment_link
+          context: ncu-product-platforms-context
+          requires:
+            - deploy_to_s3_pr
+      - validate_terraform:
+          name: validate_terraform
+          requires:
+            - deploy_terraform_s3_pr
+            - validate_deploy_terraform_s3_dev
+            - validate_deploy_terraform_s3_staging
+            - validate_deploy_terraform_s3_prod
+      # Temporarily uncomment these steps if needing to test S3 deployments on push rather than on merge
+      #- build_docs_with_no_base_url:
+      #    name: build_docs_dev
+      #    context: ncu-newskit-site-dev
+      #    requires:
+      #      - install_deps
+      #      - deploy_to_s3_pr
+      #- push_s3_general_oidc:
+      #    name: deploy_to_s3_dev
+      #    context: ncu-newskit-site-dev
+      #    s3Path_docs: s3://ncu-newskit-docs-dev/
+      #    s3Path_storybook: s3://ncu-newskit-docs-dev/storybook/
+      #    requires:
+      #      - validate_terraform
+      #      - build_docs_dev
+      #      - build_storybook
+
+  pull_request_codemod:
+    when:
+      matches:
+        # Supporting Pr branches starting with feat/, docs/, fix/, chore/, style/, refactor/, perf/, test/, etc.
+        pattern: '^build\/.*|chore\/.*|ci\/.*|docs\/.*|feat\/.*|fix\/.*|improvement\/.*|perf\/.*|refactor\/.*|revert.*\/.*|style\/.*|test\/.*|^dependabot\/.*|^snyk-upgrade.*'
+        value: << pipeline.git.branch >>
+    jobs:
+      - install_deps_codemod:
+          context: ncu-product-platforms-context
+
+      - test_unit_codemod:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps_codemod
+
+      - lint_codemod:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps_codemod
+
+      - approve_publish_npm_pr_codemod:
+          context: ncu-product-platforms-context
+          type: approval
+          requires:
+            - test_unit_codemod
+            - lint_codemod
+
+      - merge_checker:
+          context: ncu-product-platforms-context
+          requires:
+            - test_unit_codemod
+            - lint_codemod
+
+      - publish_npm_codemod:
+          name: publish_npm_pr_codemod
+          context: ncu-product-platforms-context
+          publish_dev: true
+          requires:
+            - approve_publish_npm_pr_codemod
+
+  main:
+    when:
+      equal: [main, << pipeline.git.branch >>]
+    jobs:
+      - init_aws:
           context: ncu-product-platforms-context
+      - deploy_terraform_oidc:
+          name: deploy_terraform_s3_dev
+          package: s3/dev-newskit
+          context: ncu-newskit-site-dev
+          apply: true
+          tf_env: true
           environment: dev
           requires:
             - init_aws
-      - deploy_terraform:
-          <<: *only_develop
-          name: deploy_terraform_ecr_dev
-          package: ecr
-          context: ncu-product-platforms-context
-          tf_env: false
+      - deploy_terraform_oidc:
+          name: deploy_terraform_s3_staging
+          package: s3/prod-newskit
+          context: ncu-newskit-site-stage
+          apply: true
+          tf_env: true
+          environment: staging
+          requires:
+            - init_aws
+      - deploy_terraform_oidc:
+          name: deploy_terraform_s3_prod
+          package: s3/prod-newskit
+          context: ncu-newskit-site-prod
+          apply: true
+          tf_env: true
+          environment: prod
           requires:
             - init_aws
-    # release jobs
-      - create_release_candidate:
-          <<: *only_trigger_release
-      - build_push_docker_ecr:
-          name: build_push_docker_ecr_release
+      - install_deps:
+          context: ncu-product-platforms-context
+      - install_cypress:
+          context: ncu-product-platforms-context
+      - build_components:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - build_storybook:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - build_test_e2e:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - lint:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - test_unit_comps:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - test_unit_docs:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - test_e2e_comps:
+          context: ncu-product-platforms-context
+          requires:
+            - build_test_e2e
+            - install_cypress
+      - build_docs_with_no_base_url:
+          name: build_docs_dev
+          context: ncu-newskit-site-dev
+          requires:
+            - install_deps
+      - test_broken_links_docs:
+          name: test_broken_links_docs_dev
+          context: ncu-product-platforms-context
+          requires:
+            - build_docs_dev
+      - test_e2e_docs:
+          name: test_e2e_docs_dev
+          context: ncu-newskit-site-dev
+          requires:
+            - build_docs_dev
+            - install_cypress
+            - build_storybook
+      - test_newskit_in_nextjs_app:
+          context: ncu-product-platforms-context
+          requires:
+            - build_components
+
+      # Jobs for updating Percy baselines after PRs are merged
+      - comps_tests_conditional_run_to_update_baselines:
           context: ncu-product-platforms-context
-          docker_version: release
-          <<: *only_release
           requires:
             - build_storybook
+      - docsite_tests_conditional_run_to_update_baselines:
+          context: ncu-product-platforms-context
+          requires:
+            - build_docs_dev
+            - install_cypress
+
+      # Jobs for deploying unstable NewsKit version
+      - approve_publish_npm_dev:
+          type: approval
+          requires:
+            - test_newskit_in_nextjs_app
+            - lint
+            - test_unit_comps
+            - test_unit_docs
+            - test_e2e_comps
+            - test_e2e_docs_dev
+      - publish_npm:
+          name: publish_npm_dev
+          context: ncu-product-platforms-context
+          publish_dev: true
+          requires:
+            - approve_publish_npm_dev
+        # end
+
+      - push_s3_general_oidc:
+          name: deploy_to_s3_dev
+          context: ncu-newskit-site-dev
+          s3Path_docs: s3://ncu-newskit-docs-dev/
+          s3Path_storybook: s3://ncu-newskit-docs-dev/storybook/
+          requires:
+            - deploy_terraform_s3_dev
+            - build_docs_dev
+            - build_storybook
             - lint
             - test_unit_comps
             - test_unit_docs
             - test_e2e_comps
-            - test_e2e_docs
-      - eks_flux_deploy:
-          name: eks_flux_deploy_staging
+            - test_e2e_docs_dev
+
+      - push_s3_general_oidc:
+          name: deploy_to_s3_staging
           context: ncu-newskit-site-stage
-          environment: staging
-          <<: *only_release
+          s3Path_docs: s3://ncu-newskit-docs-staging/
+          s3Path_storybook: s3://ncu-newskit-docs-staging/storybook/
+          requires:
+            - deploy_terraform_s3_staging
+            - build_docs_dev # removed build_docs_staging from this workflow to save 5 mins (docs site behaviour unaffected)
+            - build_storybook
+
+      - build_docs_with_no_base_url:
+          name: build_docs_prod
+          context: ncu-newskit-site-prod
           requires:
-            - build_push_docker_ecr_release
-      - eks_kubectl_deploy:
-          name: eks_kubectl_deploy_staging
+            - deploy_to_s3_staging
+      - push_s3_general_oidc:
+          name: deploy_to_s3_prod
           context: ncu-newskit-site-stage
-          environment: staging
-          <<: *only_release
+          s3Path_docs: s3://ncu-newskit-docs-prod/
+          s3Path_storybook: s3://ncu-newskit-docs-prod/storybook/
           requires:
-            - eks_flux_deploy_staging
-      - deploy_terraform:
-          <<: *only_release
-          name: deploy_terraform_akamai_staging
-          package: akamai
+            - deploy_terraform_s3_prod
+            - build_docs_prod
+            - build_storybook
+      # end
+
+  main_codemod:
+    when:
+      equal: [main, << pipeline.git.branch >>]
+    jobs:
+      - install_deps_codemod:
+          context: ncu-product-platforms-context
+
+      - test_unit_codemod:
           context: ncu-product-platforms-context
-          akamai: true
-          environment: staging
           requires:
-            - init_aws
-      - deploy_terraform:
-          <<: *only_release
-          name: deploy_terraform_dns_staging
-          package: dns
+            - install_deps_codemod
+
+      - lint_codemod:
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps_codemod
+
+      - approve_publish_npm_pr_codemod:
+          context: ncu-product-platforms-context
+          type: approval
+          requires:
+            - test_unit_codemod
+            - lint_codemod
+
+      - publish_npm_codemod:
+          name: publish_npm_pr_codemod
+          context: ncu-product-platforms-context
+          publish_dev: true
+          requires:
+            - approve_publish_npm_pr_codemod
+
+  on_trigger_release_tag:
+    jobs:
+      - bump_version:
+          <<: *only_on_trigger_release_tag
+          context: ncu-product-platforms-context
+          version: $(echo << pipeline.git.tag >> | cut -f2 -d "@")
+
+  on_trigger_release_tag_codemod:
+    jobs:
+      - bump_version_codemod:
+          <<: *only_on_trigger_release_tag_codemod
+          context: ncu-product-platforms-context
+          version: $(echo << pipeline.git.tag >> | cut -f2 -d "@")
+
+  on_release_version_tag:
+    # Workflow's jobs triggered by the bump_version make script, which creates and pushes a new version tag e.g: "v5.0.1".
+    jobs:
+      - delete_trigger_release_tag:
+          <<: *only_on_version_tag
           context: ncu-product-platforms-context
+          version: $(echo << pipeline.git.tag >> | cut -f2 -d "v")
+
+      - init_aws:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+      - deploy_terraform_oidc:
+          name: deploy_terraform_s3_staging
+          package: s3/prod-newskit
+          context: ncu-newskit-site-stage
+          apply: true
+          tf_env: true
           environment: staging
           requires:
             - init_aws
-    # master jobs
-      - approve_deployment:
-          type: approval
-          <<: *only_master
-      - copy_dev_baselines_to_master:
-          <<: *only_master
+      - deploy_terraform_oidc:
+          name: deploy_terraform_s3_prod
+          package: s3/prod-newskit
+          context: ncu-newskit-site-prod
+          apply: true
+          tf_env: true
+          environment: prod
+          requires:
+            - init_aws
+      - install_deps:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+      - install_cypress:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+      - build_components:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - build_storybook:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - build_test_e2e:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - lint:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - test_unit_comps:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
           requires:
-            - approve_deployment
+            - install_deps
+      - test_unit_docs:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps
+      - test_e2e_comps:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - build_test_e2e
+            - install_cypress
+      - build_docs_with_no_base_url:
+          <<: *only_on_version_tag
+          name: build_docs_versioned
+          context: ncu-newskit-site-prod
+          requires:
+            - install_deps
+            - delete_trigger_release_tag
+      - test_broken_links_docs:
+          <<: *only_on_version_tag
+          name: test_broken_links_docs_prod
+          context: ncu-product-platforms-context
+          requires:
+            - build_docs_versioned
+      - test_e2e_docs:
+          <<: *only_on_version_tag
+          name: test_e2e_docs_prod
+          context: ncu-newskit-site-prod
+          requires:
+            - build_docs_versioned
+            - install_cypress
+            - build_storybook
+      - test_newskit_in_nextjs_app:
+          <<: *only_on_version_tag
+          context: ncu-product-platforms-context
+          requires:
+            - build_components
+
       - publish_npm:
+          <<: *only_on_version_tag
           context: ncu-product-platforms-context
-          <<: *only_master
           requires:
             - lint
             - test_unit_comps
             - test_unit_docs
             - test_e2e_comps
-            - test_e2e_docs
-      - eks_flux_deploy:
-          name: eks_flux_deploy_prod
-          context: ncu-newskit-site-prod
-          environment: prod
-          <<: *only_master
+            - test_e2e_docs_prod
+            - test_newskit_in_nextjs_app
+
+      # Deploying newskit.co.uk and storybook to Staging then to Prod environment.
+      - build_docs_with_no_base_url:
+          name: build_docs_staging
+          context: ncu-newskit-site-stage
           requires:
-            - approve_deployment
+            - install_deps
             - publish_npm
-      - eks_kubectl_deploy:
-          name: eks_kubectl_deploy_prod
+      - push_s3_general_oidc:
+          name: deploy_to_s3_staging
+          context: ncu-newskit-site-stage
+          s3Path_docs: s3://ncu-newskit-docs-staging/
+          s3Path_storybook: s3://ncu-newskit-docs-staging/storybook/
+          requires:
+            - deploy_terraform_s3_staging
+            - build_docs_staging
+            - build_storybook
+
+      - build_docs_with_no_base_url:
+          name: build_docs_prod
           context: ncu-newskit-site-prod
-          environment: prod
-          notify: true
-          <<: *only_master
-          requires:
-            - eks_flux_deploy_prod
-      - deploy_terraform:
-          <<: *only_master
-          name: deploy_terraform_akamai_prod
-          package: akamai
+          requires:
+            - install_deps
+            - deploy_to_s3_staging
+      - push_s3_general_oidc:
+          name: deploy_to_s3_prod
+          context: ncu-newskit-site-prod
+          s3Path_docs: s3://ncu-newskit-docs-prod/
+          s3Path_storybook: s3://ncu-newskit-docs-prod/storybook/
+          requires:
+            - deploy_terraform_s3_prod
+            - build_docs_prod
+            - build_storybook
+
+  on_release_version_tag_codemod:
+    # Workflow's jobs triggered by the bump_version_codemod make script, which creates and pushes a new version tag e.g: "codemod-v5.0.1".
+    jobs:
+      - delete_trigger_release_tag_codemod:
+          <<: *only_on_version_tag_codemod
           context: ncu-product-platforms-context
-          akamai: true
-          environment: prod
+          version: $(echo << pipeline.git.tag >> | cut -f2 -d "v")
+
+      - install_deps_codemod:
+          <<: *only_on_version_tag_codemod
+          context: ncu-product-platforms-context
+
+      - test_unit_codemod:
+          <<: *only_on_version_tag_codemod
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps_codemod
+
+      - lint_codemod:
+          <<: *only_on_version_tag_codemod
+          context: ncu-product-platforms-context
+          requires:
+            - install_deps_codemod
+
+      - publish_npm_codemod:
+          <<: *only_on_version_tag_codemod
+          context: ncu-product-platforms-context
+          publish_dev: false
           requires:
-            - init_aws
+            - test_unit_codemod
+            - lint_codemod